fix: sort and deduplicate auto traits in trait object types #12793
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lowr
changed the title
|
☔ The latest upstream changes (presumably #13049) made this pull request unmergeable. Please resolve the merge conflicts. |
lowr
force-pushed
the
fix/12739
branch
2 times, most recently
from
b86387e to
a626774
Compare
crates/hir-ty/src/lower.rs
Outdated
| return None; | ||
| } | ||
|
|
||
| auto_traits.sort_by_key(|b| b.trait_id().unwrap()); |
There was a problem hiding this comment.
Shouldn't sort_unstable_by_key() be preferred?
There was a problem hiding this comment.
Sounds right, we don't need stability here. Thanks for pointing out!
|
Thanks! |
|
☀️ Test successful - checks-actions |
bors
added a commit
that referenced
this pull request
Sep 5, 2022
fix: sort all bounds on trait object types Fixes #13181 #12793 allowed different ordering of trait bounds in trait object types but failed to account for the ordering of projection bounds. I opted for sorting all the bounds at once rather than splitting them into `SmallVec`s so it's easier to do the same thing for other bounds when we have them.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #12739
Chalk solver doesn't sort and deduplicate auto traits in trait object types, so we need to handle them ourselves in the lowering phase, just like
rustcandchalk-integrationdo.Quoting from the Chalk book:
Also, trait object types with more than one non-auto traits were previously allowed, but are now disallowed with this patch.