Walk un-shifted nested impl Trait in trait when setting up default trait method assumptions#109240
Merged
bors merged 2 commits intorust-lang:masterfrom Mar 21, 2023
Merged
Conversation
Collaborator
|
r? @wesleywiser (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
compiler-errors
commented
Mar 16, 2023
compiler/rustc_ty_utils/src/ty.rs
Outdated
Contributor
Author
There was a problem hiding this comment.
When we turn alias_ty into shifted_alias_ty, we shift all the binders from self.depth to ty::INNERMOST so we have no escaping bound vars in the projection we collect at 285.
So when we walk the type's bounds on line 309, conceptually alias_ty's substs are technically only now one binder deep, so shifting any nested impl traits would result in us shifting to a negative de bruijn index.
Collaborator
|
☔ The latest upstream changes (presumably #109253) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
|
r? @oli-obk |
compiler-errors
force-pushed
the
dont-binder-twice
branch
from
bc3ae85 to
239ec6c
Compare
oli-obk
reviewed
Mar 20, 2023
| .tcx | ||
| .type_of(alias_ty.def_id) | ||
| .subst(self.tcx, alias_ty.substs) | ||
| self.tcx.type_of(shifted_alias_ty.def_id).subst(self.tcx, shifted_alias_ty.substs) |
Contributor
There was a problem hiding this comment.
we really need a alias_ty.type_of(tcx) method, this code snippet exists way too often 😆
Contributor
Author
There was a problem hiding this comment.
I can add it :D
Contributor
|
@bors r+ |
Collaborator
bors
added
S-waiting-on-bors
Contributor
|
@bors rollup |
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 21, 2023
… r=oli-obk Walk un-shifted nested `impl Trait` in trait when setting up default trait method assumptions Fixes a double subtraction in some binder math in return-position `impl Trait` in trait handling code. Fixes rust-lang#109239
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 21, 2023
… r=oli-obk Walk un-shifted nested `impl Trait` in trait when setting up default trait method assumptions Fixes a double subtraction in some binder math in return-position `impl Trait` in trait handling code. Fixes rust-lang#109239
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 21, 2023
… r=oli-obk Walk un-shifted nested `impl Trait` in trait when setting up default trait method assumptions Fixes a double subtraction in some binder math in return-position `impl Trait` in trait handling code. Fixes rust-lang#109239
Noratrieb
added a commit
to Noratrieb/rust
that referenced
this pull request
Mar 21, 2023
… r=oli-obk Walk un-shifted nested `impl Trait` in trait when setting up default trait method assumptions Fixes a double subtraction in some binder math in return-position `impl Trait` in trait handling code. Fixes rust-lang#109239
Noratrieb
added a commit
to Noratrieb/rust
that referenced
this pull request
Mar 21, 2023
… r=oli-obk Walk un-shifted nested `impl Trait` in trait when setting up default trait method assumptions Fixes a double subtraction in some binder math in return-position `impl Trait` in trait handling code. Fixes rust-lang#109239
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 21, 2023
Rollup of 10 pull requests Successful merges: - rust-lang#106434 (Document `Iterator::sum/product` for Option/Result) - rust-lang#108326 (Implement read_buf for a few more types) - rust-lang#108842 (Enforce non-lifetime-binders in supertrait preds are not object safe) - rust-lang#108896 (new solver: make all goal evaluation able to be automatically rerun ) - rust-lang#109124 (Add `dist.compression-profile` option to control compression speed) - rust-lang#109240 (Walk un-shifted nested `impl Trait` in trait when setting up default trait method assumptions) - rust-lang#109385 (fix typo) - rust-lang#109386 (add myself to mailmap) - rust-lang#109390 (Custom MIR: Support aggregate expressions) - rust-lang#109408 (not *all* retags might be explicit in Runtime MIR) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
5 participants
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 a double subtraction in some binder math in return-position
impl Traitin trait handling code.Fixes #109239