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 4 pull requests #71431

Merged
merged 14 commits into from
Apr 22, 2020
Merged

Rollup of 4 pull requests #71431

merged 14 commits into from
Apr 22, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 14 commits April 18, 2020 13:56
Miri: mplace_access_checked: offer option to force different alignment on place

Required to solve rust-lang/miri#1339 in rust-lang/miri#1348.

r? @oli-obk
…oli-obk

Exhaustively match on `{Statement,Terminator}Kind` during const checking

This adds a pre-monomorphization error for inline assembly in a const context as well.

r? @oli-obk
…=GuillaumeGomez

Added detailed error code explanation for issue E0696 in Rust compiler.

Added proper error explanation for issue E0696 in the Rust compiler.
Error Code E0696

Sub Part of Issue rust-lang#61137

r? @GuillaumeGomez
… r=wesleywiser

visit_place_base is just visit_local

r? @wesleywiser
@Dylan-DPC-zz
Copy link
Author

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented Apr 22, 2020

📌 Commit 238e822 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 Apr 22, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Apr 22, 2020
@bors
Copy link
Contributor

bors commented Apr 22, 2020

⌛ Testing commit 238e822 with merge b2e36e6...

@bors
Copy link
Contributor

bors commented Apr 22, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 22, 2020
@bors bors merged commit b2e36e6 into rust-lang:master Apr 22, 2020
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: 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.

7 participants