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

Revert "Prefer projection candidates instead of param_env candidates for Sized predicates" #96593

Merged
merged 1 commit into from
May 5, 2022

Conversation

jackh726
Copy link
Member

@jackh726 jackh726 commented May 1, 2022

Fixes #93262
Reopens #89352

This was a hack that seemed to have no negative side-effects at the time. Given that the latter has a workaround and likely less common than the former, it makes sense to revert this change.

r? @compiler-errors

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 1, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 1, 2022
@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 2, 2022

📌 Commit 121c978 has been approved by compiler-errors

@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 May 2, 2022
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request May 2, 2022
…rors

Revert "Prefer projection candidates instead of param_env candidates for Sized predicates"

Fixes rust-lang#93262
Reopens rust-lang#89352

This was a hack that seemed to have no negative side-effects at the time. Given that the latter has a workaround and likely less common than the former, it makes sense to revert this change.

r? `@compiler-errors`
@JohnTitor
Copy link
Member

Failed in rollup: #96653 (comment)
@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 3, 2022
@jackh726
Copy link
Member Author

jackh726 commented May 4, 2022

@bors r=compiler-errors

Apparently #89352 passes under NLL. That's great.

@bors
Copy link
Contributor

bors commented May 4, 2022

📌 Commit 8e31cde has been approved by compiler-errors

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 4, 2022
@bors
Copy link
Contributor

bors commented May 5, 2022

⌛ Testing commit 8e31cde with merge bdcb6a9...

@bors
Copy link
Contributor

bors commented May 5, 2022

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing bdcb6a9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 5, 2022
@bors bors merged commit bdcb6a9 into rust-lang:master May 5, 2022
@rustbot rustbot added this to the 1.62.0 milestone May 5, 2022
@jackh726 jackh726 deleted the issue-93262 branch May 5, 2022 03:16
@bors bors mentioned this pull request May 5, 2022
5 tasks
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (bdcb6a9): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@jackh726
Copy link
Member Author

@jackh726 jackh726 added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 12, 2022
@jackh726 jackh726 mentioned this pull request May 13, 2022
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.62.0, 1.61.0 May 13, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2022
…ulacrum

[beta] backports

This backports/rolls up:

*  Quick fix for rust-lang#96223. rust-lang#96679
*  [beta] Revert rust-lang#92519 on beta rust-lang#96556
*  [beta] Clippy backport ICE/infinite loop fix rust-lang#96740
*  Revert "Prefer projection candidates instead of param_env candidates for Sized predicates" rust-lang#96593
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GAT: lifetime is inconsistently required with Higher-Rank Trait Bounds
8 participants