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

[beta] backports #80560

Merged
merged 5 commits into from
Dec 31, 2020
Merged

[beta] backports #80560

merged 5 commits into from
Dec 31, 2020

Conversation

Mark-Simulacrum
Copy link
Member

This backports accepted PRs and switches to bootstrapping from the released compiler:

r? @Mark-Simulacrum

Mark-Simulacrum and others added 5 commits December 31, 2020 09:49
When normalizing a projection which results in a cycle, we would
cache the result of `project_type` without the nested obligations
(because they're not needed for inference). This would result in
the nested obligations only being handled once in fulfill, which
would avoid the cycle error.

Fixes rust-lang#79714, a regresion from rust-lang#79305 caused by the removal of
`get_paranoid_cache_value_obligation`.
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 31, 2020
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Dec 31, 2020

📌 Commit 89164cd has been approved by Mark-Simulacrum

@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 Dec 31, 2020
@bors
Copy link
Contributor

bors commented Dec 31, 2020

⌛ Testing commit 89164cd with merge 25b3db3...

@bors
Copy link
Contributor

bors commented Dec 31, 2020

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 25b3db3 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 31, 2020
@bors bors merged commit 25b3db3 into rust-lang:beta Dec 31, 2020
@rustbot rustbot added this to the 1.50.0 milestone Dec 31, 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. 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.

6 participants