Skip to content

Rollup of 6 pull requests - #71985

Merged
bors merged 22 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-9ceqump
May 7, 2020
Merged

Rollup of 6 pull requests#71985
bors merged 22 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-9ceqump

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

mark-i-mand others added 22 commits May 5, 2020 21:32
On Windows, these types were causing warnings to be emitted during the
build. These types are allowed to not have idiomatic names, so the
warning should be supressed.
Add some regression tests
Closesrust-lang#29988Closesrust-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".
…-Simulacrum
Allow a few warnings.
On Windows, these types were causing warnings to be emitted during the
build. These types are allowed to not have idiomatic names, so the
warning should be supressed.
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=6

@bors

bors commented May 7, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit c818e84 has been approved by Dylan-DPC

@borsbors 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

bors commented May 7, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c818e84 with merge a08c473...

@bors

bors commented May 7, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: Dylan-DPC
Pushing a08c473 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 7, 2020
@bors
bors merged commit a08c473 into rust-lang:masterMay 7, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@Dylan-DPC-zz@bors@mark-i-m@JohnTitor@petrochenkov@jsoref@RalfJung@steveklabnik@Dylan-DPC