Skip to content

Rollup of 5 pull requests - #72589

Merged
bors merged 12 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-7l2a2bo
May 26, 2020
Merged

Rollup of 5 pull requests#72589
bors merged 12 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-7l2a2bo

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

lcnrand others added 12 commits May 9, 2020 22:02
add regression tests for stalled_on const vars
closesrust-lang#70180
Afaict this has been fixed sometime after rust-lang#70213
`trait_ref_type_vars` correctly adds const infers and I did not find any remaining `FIXME`s which correspond to this issue.
https://github.com/rust-lang/rust/blob/7c59a81a5fcbaaca311f744cd7c68d99bfbb05d3/src/librustc_trait_selection/traits/fulfill.rs#L555-L557
Added both examples from the issue as regression tests and renamed `trait_ref_type_vars` -> `trait_ref_infer_vars`.
r? @eddyb
fix ICE when debug-printing MIR
Fixesrust-lang#72105
This bug also makes debugging Miri harder as `MIRI_LOG=info` ICEs.
…r=matthewjasper
Perform MIR NRVO even if types don't match
This is the most straightforward way to resolverust-lang#72428, but it could cause problems in codegen since the type of `_0` may no longer match the return type of the body.
…-query, r=oli-obk
Removed all instances of const_field.
Fixesrust-lang#72264
r? @oli-obk
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=5

@bors

bors commented May 25, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit b6a8915 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 25, 2020
@bors

bors commented May 25, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b6a8915 with merge 698c5c6...

@bors

bors commented May 26, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 26, 2020
@bors
bors merged commit 698c5c6 into rust-lang:masterMay 26, 2020
@JohnTitorJohnTitor added the rollup A PR which is a rollup label May 28, 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.rollupA PR which is a rollupS-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@JohnTitor@lcnr@csmoe@ecstatic-morse@rakshith-ravi@RalfJung@Dylan-DPC