refactor the normalization in coerce_shared_info#158659
Merged
Merged
Conversation
This comment has been minimized.
This comment has been minimized.
lcnr
reviewed
Jul 1, 2026
e230f7e to
3d7f010
Compare
lcnr
reviewed
Jul 2, 2026
| let ty = f.ty(tcx, args).skip_norm_wip(); | ||
| if ty.is_phantom_data() { | ||
| let ty = f.ty(tcx, args); | ||
| if ty.skip_normalization().is_phantom_data() { |
Contributor
There was a problem hiding this comment.
can you keep that as skip_norm_wip? I am not confident we don't want to allow <PhantomData as Id>::This here or some free type alias that normalizes to PhantomData
Contributor
There was a problem hiding this comment.
maybe even a FIXME(whatever-feature)
lcnr
reviewed
Jul 2, 2026
| @@ -0,0 +1,45 @@ | |||
| //@ check-pass | |||
|
|
|||
Contributor
There was a problem hiding this comment.
can you add a comment explaining what this does :>
3d7f010 to
23e6ca0
Compare
Contributor
Author
|
@bors r=lcnr rollup |
Contributor
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Jul 3, 2026
…, r=lcnr refactor the normalization in `coerce_shared_info` This is pre-requisite of removing `eq_structurally_relating_aliases` which is part of rust-lang#155345. `coerce_shared_info` is only used in the unstable feature `reborrow` which provides a `CoerceShared` trait indicating a mutable borrow can be converted into a shared borrow. I think using `deeply_normalize` is more suitable for these identity instantiated types. No reason to allow ambiguous normalization and use infer vars as normalization result here. r? lcnr
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 5, 2026
Rollup of 18 pull requests Successful merges: - #158692 (Add release notes for 1.96.1) - #134021 (Implement `IntoIterator` for `[&[mut]] Box<[T; N], A>`) - #152860 (Port the `without_debuginfo` test from `backtrace-rs` to the testsuite) - #155932 (MIR Call terminator: evaluate destination place before arguments) - #156777 (Add -Zautodiff_post_passes flag to limit which llvm passes to run after enzyme to make autodiff tests more robust) - #157151 (JSON target specs: remove 'x86-softfloat' compatibility alias) - #157835 (expand free alias types in the auto-trait orphan check) - #158377 (add `-Zforce-intrinsic-fallback` flag) - #158434 (delegation: refactor AST -> HIR lowering) - #158552 (make some tidy errors around python easier to understand) - #158624 (borrowck: Introduce BlameConstraint::to_obligation_cause_from_path()) - #158704 (Optimize `ArrayChunks::try_rfold` with `DoubleEndedIterator::next_chunk_back`) - #158711 (library: Comment on libtest's dicey internal soundness) - #158539 (Move `SizeHint` and `IoHandle` to `core::io`) - #158659 (refactor the normalization in `coerce_shared_info`) - #158689 (resolver: don't use `Finalize` when resolving visibilities during AST expansion) - #158698 (Update TypeVisitable implementation) - #158706 (Tweaks to MIR building scope API)
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Jul 5, 2026
…, r=lcnr refactor the normalization in `coerce_shared_info` This is pre-requisite of removing `eq_structurally_relating_aliases` which is part of rust-lang#155345. `coerce_shared_info` is only used in the unstable feature `reborrow` which provides a `CoerceShared` trait indicating a mutable borrow can be converted into a shared borrow. I think using `deeply_normalize` is more suitable for these identity instantiated types. No reason to allow ambiguous normalization and use infer vars as normalization result here. r? lcnr
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 5, 2026
…uwer Rollup of 20 pull requests Successful merges: - #158692 (Add release notes for 1.96.1) - #134021 (Implement `IntoIterator` for `[&[mut]] Box<[T; N], A>`) - #155932 (MIR Call terminator: evaluate destination place before arguments) - #155989 (Update `transmute_copy` to ub_checks and `?Sized`) - #156777 (Add -Zautodiff_post_passes flag to limit which llvm passes to run after enzyme to make autodiff tests more robust) - #157151 (JSON target specs: remove 'x86-softfloat' compatibility alias) - #157835 (expand free alias types in the auto-trait orphan check) - #157857 (Stabilize `#[my_macro] mod foo;` (part of `proc_macro_hygiene`)) - #158377 (add `-Zforce-intrinsic-fallback` flag) - #158434 (delegation: refactor AST -> HIR lowering) - #158552 (make some tidy errors around python easier to understand) - #158624 (borrowck: Introduce BlameConstraint::to_obligation_cause_from_path()) - #158704 (Optimize `ArrayChunks::try_rfold` with `DoubleEndedIterator::next_chunk_back`) - #158711 (library: Comment on libtest's dicey internal soundness) - #158751 (rustdoc: Fix crash when trying to inline foreign item which cannot have attributes) - #158539 (Move `SizeHint` and `IoHandle` to `core::io`) - #158659 (refactor the normalization in `coerce_shared_info`) - #158689 (resolver: don't use `Finalize` when resolving visibilities during AST expansion) - #158698 (Update TypeVisitable implementation) - #158706 (Tweaks to MIR building scope API)
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 5, 2026
…uwer Rollup of 19 pull requests Successful merges: - #158692 (Add release notes for 1.96.1) - #134021 (Implement `IntoIterator` for `[&[mut]] Box<[T; N], A>`) - #155932 (MIR Call terminator: evaluate destination place before arguments) - #155989 (Update `transmute_copy` to ub_checks and `?Sized`) - #156777 (Add -Zautodiff_post_passes flag to limit which llvm passes to run after enzyme to make autodiff tests more robust) - #157151 (JSON target specs: remove 'x86-softfloat' compatibility alias) - #157835 (expand free alias types in the auto-trait orphan check) - #157857 (Stabilize `#[my_macro] mod foo;` (part of `proc_macro_hygiene`)) - #158434 (delegation: refactor AST -> HIR lowering) - #158552 (make some tidy errors around python easier to understand) - #158624 (borrowck: Introduce BlameConstraint::to_obligation_cause_from_path()) - #158704 (Optimize `ArrayChunks::try_rfold` with `DoubleEndedIterator::next_chunk_back`) - #158711 (library: Comment on libtest's dicey internal soundness) - #158751 (rustdoc: Fix crash when trying to inline foreign item which cannot have attributes) - #158539 (Move `SizeHint` and `IoHandle` to `core::io`) - #158659 (refactor the normalization in `coerce_shared_info`) - #158689 (resolver: don't use `Finalize` when resolving visibilities during AST expansion) - #158698 (Update TypeVisitable implementation) - #158706 (Tweaks to MIR building scope API)
rust-timer
added a commit
that referenced
this pull request
Jul 5, 2026
Rollup merge of #158659 - adwinwhite:coerce-shared-info-norm, r=lcnr refactor the normalization in `coerce_shared_info` This is pre-requisite of removing `eq_structurally_relating_aliases` which is part of #155345. `coerce_shared_info` is only used in the unstable feature `reborrow` which provides a `CoerceShared` trait indicating a mutable borrow can be converted into a shared borrow. I think using `deeply_normalize` is more suitable for these identity instantiated types. No reason to allow ambiguous normalization and use infer vars as normalization result here. r? lcnr
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.
This is pre-requisite of removing
eq_structurally_relating_aliaseswhich is part of #155345.coerce_shared_infois only used in the unstable featurereborrowwhich provides aCoerceSharedtrait indicating a mutable borrow can be converted into a shared borrow.I think using
deeply_normalizeis more suitable for these identity instantiated types.No reason to allow ambiguous normalization and use infer vars as normalization result here.
r? lcnr