Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #71978

Closed
wants to merge 19 commits into from

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

JohnTitor and others added 19 commits May 7, 2020 02:22
…trochenkov

reword "possible candidate" import suggestion

This suggestion has always read a bit awkwardly to me, particularly the "possible better candidate" variant.

This commit rewords the suggestion to be more concise and mention the kind of the suggested item. There isn't a nice way to label individual suggestions, so I opted to use "items" in the case of multiple suggestions.
Add some regression tests

Closes rust-lang#29988
Closes rust-lang#34979
Pick up two snippets that have been fixed from rust-lang#67945 (shouldn't be closed yet!)
…acrum

tests: Fix warnings in `rust_test_helpers.c`

MSVC is silly and doesn't recognize `assert` as diverging.
Grammar

I've split this into individual changes so that people can veto individually. I'm not attached to most of them.

`zeroes` vs. `zeros` is why I took the effort to run this through app.grammarly (which disappointingly didn't even notice).
…, r=oli-obk

use hex for pointers in Miri error messages

Also refine vtable error message: distinguish between "drop fn does not point to a function" and "drop fn points to a function with the wrong signature".
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented May 7, 2020

📌 Commit 1f73d8d has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 7, 2020
@bors
Copy link
Contributor

bors commented May 7, 2020

⌛ Testing commit 1f73d8d with merge b7d2d2caa3cd019770b06e24920f20126db10cdb...

@bors
Copy link
Contributor

bors commented May 7, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 7, 2020
@Dylan-DPC-zz
Copy link
Author

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 7, 2020
@bors
Copy link
Contributor

bors commented May 7, 2020

⌛ Testing commit 1f73d8d with merge 9a32b4ad89ea74677eaa678f7580394d59c75bd6...

@RalfJung
Copy link
Member

RalfJung commented May 7, 2020

The log says

stderr:
------------------------------------------
D:\a\rust\rust\src/test\codegen\ffi-out-of-bounds-loads.rs:18:12: error: CHECK: expected string not found in input
 // CHECK: load { i64, i32 }, { i64, i32 }* {{.*}}, align 4
           ^
D:\a\rust\rust\build\x86_64-pc-windows-msvc\test\codegen\ffi-out-of-bounds-loads\ffi-out-of-bounds-loads.ll:1:1: note: scanning from here
; ModuleID = 'ffi_out_of_bounds_loads.7rcbfp3g-cgu.0'
^
D:\a\rust\rust\build\x86_64-pc-windows-msvc\test\codegen\ffi-out-of-bounds-loads\ffi-out-of-bounds-loads.ll:52:8: note: possible intended match here
 %_2 = load i32, i32* %self, align 4
       ^

------------------------------------------



failures:
    [codegen] codegen\ffi-out-of-bounds-loads.rs

That codegen test was added in #71952.
This doesn't quite look spurious?

@RalfJung
Copy link
Member

RalfJung commented May 7, 2020

However @pietroalbini something is wrong with whatever bors linked to above, both here and in #71966: it linked to https://github.com/rust-lang-ci/rust/runs/653177525 which just says "mark the job as a failure",

Run exit 1
##[error]Process completed with exit code 1.

One has to ignore that and find the actual failing job in the list on the left to figure out what happened.

@Dylan-DPC-zz
Copy link
Author

Yeh i got a different thing (maybe a different build) hence assumed spurious. I'll r- that one and re-roll

@bors
Copy link
Contributor

bors commented May 7, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 7, 2020
@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-mqp40gi branch May 7, 2020 16:18
@pietroalbini
Copy link
Member

@RalfJung opened #71987 to track your feedback.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants