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 #72589

Merged
merged 12 commits into from
May 26, 2020
Merged

Rollup of 5 pull requests #72589

merged 12 commits into from
May 26, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

lcnr and others added 12 commits May 9, 2020 22:02
add regression tests for stalled_on const vars

closes rust-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

Fixes rust-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 resolve rust-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.

Fixes rust-lang#72264

r? @oli-obk
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented May 25, 2020

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

bors commented May 25, 2020

⌛ Testing commit b6a8915 with merge 698c5c6...

@bors
Copy link
Contributor

bors commented May 26, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 26, 2020
@bors bors merged commit 698c5c6 into rust-lang:master May 26, 2020
@JohnTitor JohnTitor added the rollup A PR which is a rollup label May 28, 2020
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.

9 participants