trait_solver: normalize next-gen region constraints#158404
Open
Dnreikronos wants to merge 2 commits into
Open
Conversation
Collaborator
|
r? @camelid rustbot has assigned @camelid. Use Why was this reviewer chosen?The reviewer was selected based on:
|
This comment has been minimized.
This comment has been minimized.
Canonicalize and evaluate next-gen region constraints before query response canonicalization so equivalent constraints merge structurally.
0ea1284 to
9c1ee51
Compare
Cover the dyn object supertrait case that used to leave equivalent next-gen region constraints in different shapes.
7588b8f to
12ae52a
Compare
Member
|
I don't have familiarity with this code, so rerolling. @rustbot reroll |
Member
|
Me neither, @rustbot reroll |
Contributor
|
Me three. Let's try something more targeted: r? types |
Contributor
|
r? BoxyUwU |
Collaborator
|
|
This file contains hidden or 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
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 #157729
-zassumptions-on-binders can produce next-gen region constraints that mean the same thing but don't have the same shape. in this case object candidate merging stayed ambiguous and instance resolution later hit the ice. imo normalizing the constraint at the response boundary is the least weird place for this, because candidate selection shouldn't need to know which vtable looks nicer.
canonicalize and evaluate the next-gen region constraint before response canonicalization, then cover the dyn derived
supertrait case from the issue. lgtm locally with the focused test, tests/ui/traits/next-solver, and tests/ui/assumptions_on_binders. idk if there's a better home for the helper call, but ltm this keeps the fix pretty narrow.