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

Quick fix for #96223. #96679

Merged
merged 2 commits into from
May 4, 2022
Merged

Quick fix for #96223. #96679

merged 2 commits into from
May 4, 2022

Conversation

ricked-twice
Copy link
Contributor

This PR is a quick fix regarding #96223.

As mentioned in the issue, others modification could be added to not elide types with bound vars from suggestions.

Special thanks to @jackh726 for mentoring and @Manishearth for minimal test case.

r? @jackh726

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 3, 2022
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @jackh726 (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 3, 2022
Copy link
Member

@jackh726 jackh726 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small comments but overall LGTM

src/test/ui/suggestions/issue-96223.rs Outdated Show resolved Hide resolved
src/test/ui/suggestions/issue-96223.rs Outdated Show resolved Hide resolved
@jackh726
Copy link
Member

jackh726 commented May 3, 2022

Awesome. @bors r+ rollup

@jackh726
Copy link
Member

jackh726 commented May 3, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 3, 2022

📌 Commit 574bee3 has been approved by jackh726

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

Quick fix for rust-lang#96223.

This PR is a quick fix regarding rust-lang#96223.

As mentioned in the issue, others modification could be added to not elide types with bound vars from suggestions.

Special thanks to `@jackh726` for mentoring and `@Manishearth` for minimal test case.

r? `@jackh726`
bors added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2022
Rollup of 6 pull requests

Successful merges:

 - rust-lang#96597 (openbsd: unbreak build on native platform)
 - rust-lang#96662 (Fix typo in lint levels doc)
 - rust-lang#96668 (Fix flaky rustdoc-ui test because it did not replace time result)
 - rust-lang#96679 (Quick fix for rust-lang#96223.)
 - rust-lang#96684 (Update `ProjectionElem::Downcast` documentation)
 - rust-lang#96686 (Add some TAIT-related tests)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d0a7a4c into rust-lang:master May 4, 2022
@rustbot rustbot added this to the 1.62.0 milestone May 4, 2022
@Manishearth Manishearth added the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 5, 2022
@Manishearth
Copy link
Member

@rust-lang/release Can this be uplifted to the beta so it makes the coming release? Without this patch ICU4X is quite prone to hitting this ICE, obscuring any real errors.

@jackh726
Copy link
Member

jackh726 commented May 5, 2022

Ah I meant to beta nominate, whoops. Thanks @Manishearth.

@jackh726
Copy link
Member

jackh726 commented May 5, 2022

This will need compile team approval though

@Manishearth
Copy link
Member

cc @rust-lang/compiler

@oli-obk oli-obk added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 5, 2022
@oli-obk
Copy link
Contributor

oli-obk commented May 5, 2022

Accepting for beta backport.

This is solely on the diagnostics path, fixes a frequent ICE and is a tiny change.

@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label 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
@ricked-twice ricked-twice deleted the issue-96223-fix branch May 17, 2022 16:05
@ricked-twice ricked-twice restored the issue-96223-fix branch May 17, 2022 16:05
@ricked-twice ricked-twice deleted the issue-96223-fix branch May 23, 2022 10:48
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. 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.

8 participants