Erase lifetimes above ty::INNERMOST when probing ambiguous types
#110195
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
|
r? @lcnr (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
|
@bors r+ |
bors
added
S-waiting-on-bors
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Apr 13, 2023
…iemjay Erase lifetimes above `ty::INNERMOST` when probing ambiguous types Turns out that `TyCtxt::replace_escaping_bound_vars_uncached` only erases bound vars exactly at `ty::INNERMOST`, and not everything above. This regresses the suggestions for non-lifetime binders, but oh well, I don't really care about those. Fixes rust-lang#110052
lcnr
reviewed
Apr 13, 2023
| // I guess we don't need to make a universe unless we need it, | ||
| // but also we're on the error path, so it doesn't matter here. | ||
| let universe = infcx.create_next_universe(); | ||
| let value = tcx.fold_regions(qself_ty, |_, _| tcx.lifetimes.re_erased); |
There was a problem hiding this comment.
sidenote, we should rename this function to fold_free_regions, or even map_free_regions. Because currently it feels unclear whether this is supposed to modify bound regions
There was a problem hiding this comment.
"free" here is ambiguous because it also folds escaping bound vars, but yeah, I do think it needs a better name.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 13, 2023
…iemjay Erase lifetimes above `ty::INNERMOST` when probing ambiguous types Turns out that `TyCtxt::replace_escaping_bound_vars_uncached` only erases bound vars exactly at `ty::INNERMOST`, and not everything above. This regresses the suggestions for non-lifetime binders, but oh well, I don't really care about those. Fixes rust-lang#110052
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 13, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#110072 (Stabilize IsTerminal) - rust-lang#110195 (Erase lifetimes above `ty::INNERMOST` when probing ambiguous types) - rust-lang#110218 (Remove `ToRegionVid`) - rust-lang#110220 (cleanup our region error API) - rust-lang#110234 (Fix btree `CursorMut::insert_after` check) - rust-lang#110262 (Update unwind_safe.rs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
Turns out that
TyCtxt::replace_escaping_bound_vars_uncachedonly erases bound vars exactly atty::INNERMOST, and not everything above. This regresses the suggestions for non-lifetime binders, but oh well, I don't really care about those.Fixes #110052