Remap impl-trait lifetimes on HIR instead of AST lowering #129383
+1,462
−1,711
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
rustbot
added
S-waiting-on-review
rustbot
added
S-blocked
cjgillot
force-pushed
the
opaque-noremap
branch
2 times, most recently
from
8127ba2
to
d334955
Compare
This comment has been minimized.
This comment has been minimized.
cjgillot
force-pushed
the
opaque-noremap
branch
from
d334955
to
1729436
Compare
|
☔ The latest upstream changes (presumably #129540) made this pull request unmergeable. Please resolve the merge conflicts. |
This introduce an additional collection of opaques on HIR, as they can no longer be listed using the free item list.
cjgillot
force-pushed
the
opaque-noremap
branch
from
1729436
to
92cd183
Compare
|
☔ The latest upstream changes (presumably #126161) made this pull request unmergeable. Please resolve the merge conflicts. |
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.
Current AST->HIR lowering goes out of its way to remap lifetimes for opaque types. This is complicated and leaks into upstream and downstream code.
This PR stops trying to be clever during lowering, and prefers to do this remapping during the HIR->ty lowering. The remapping computation easily fits into the bound var resolution code. Its result can be used in by
generics_ofandhir_ty_lowering::new_opaqueto add the proper parameters and arguments.See an example on the doc for query
opaque_captured_lifetimes.Based on #129244
Fixes #125249
Fixes #126850
cc @compiler-errors @spastorino
r? @petrochenkov