-
-
Notifications
You must be signed in to change notification settings - Fork 15.5k
-Znext-solver Allow method calls on chains of assoc types of not-yet defined opaque types
#161414
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
Draft
ShoyuVanilla
wants to merge
10
commits into
rust-lang:main
Choose a base branch
from
ShoyuVanilla:opaque-hidden-bounds
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
5ae3113
`-Znext-solver` Allow method calls on (recursive) assoc types of not-…
ShoyuVanilla 26ab1ef
Fix incorrect things
ShoyuVanilla 8a3df0d
Add another test
ShoyuVanilla f9d40d2
Fix some comments
ShoyuVanilla d5709a7
Check `has_changed` of response after instantiating the opaques
ShoyuVanilla 9c3efe1
Remove `Option` wrapper of hidden bounds and rename bunch of things
ShoyuVanilla b3176d8
Improve and fix constructions of `OpaqueHiddenTyBound`
ShoyuVanilla ce7aa93
Less surprise in hidden types of opaques dedup
ShoyuVanilla 77b87c8
Try to improve perf a bit
ShoyuVanilla 07db610
Intern opaque related fields from `ExternalConstraintsData`
ShoyuVanilla File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This might be obvious but I'm struggling to understand why we can detect the projection term via hidden infer var. 😢
Issue 248 is about
<hidden as Trait>::Projection: ProjectionItemBound. Theself_tyin method lookup is an fresh infer var from normalizing<hidden as Trait>::Projection, I presume? So it's not thehiddeninfer var. However, item bounds we gather from the projection item are keyed byhidden🤔View changes since the review
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it is. So
has_hidden_types_of_opaques_modulo_sub_unificationchecks both cases for?fresh_infer_var_for_opaqueand?fresh_infer_var_for_possibly_multiple_projection_on_opaque), the key for those bounds.It is necessary to check the later as we have the cases with
<<{opaque} as TraitA>::Assoc> as TraitB>::Assoclike the following, which is compiled with the old solver (and this PR) but not with the next-solver:Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the method body,
has_hidden_types_of_opaques_modulo_sub_unificationonly checks the keys ofhidden_types_of_opaquesso you mean those keys also contains fresh infer vars from normalizing projections 🤔But I don't find where we add bounds for these fresh infer vars? They're all for hidden infers of opaques?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's here:
https://github.com/rust-lang/rust/pull/161414/changes#diff-d8a295bd5782c31d629fd6936ca4d1874550fe422f1d7f798dac8998c3844524R1101-R1118
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Finally got it. Thank you for the explanation!
We could use better naming for these things now that they handle more than hidden types of opaques?
Ofc we should fix correctness issues first :>
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I really should fix those namings 😄 I hope most of the correctness things(except folding binders and some canonicalization things) might be fixed by now so I'll try the perf and the naming/comments sides soon