Skip to content

Do not rely on type_var_origin in OrphanCheckErr::NonLocalInputType #138727

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Mar 21, 2025
Merged

Do not rely on type_var_origin in OrphanCheckErr::NonLocalInputType #138727

merged 1 commit into from
Mar 21, 2025

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Mar 20, 2025 •
edited by fmease
Loading

The ordering of ty var unification means that we may end up with a root variable whose ty var origin is from another item's params.

Let's not rely on this by just unifying the infer vars with the params of the impl + resolving. It's kinda goofy but it's clearer IMO.

Fixes #132826.

r? @fmease or @lcnr

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Mar 20, 2025
@rustbot
Copy link
Collaborator

rustbot commented Mar 20, 2025

This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.

@fmease
Copy link
Member

fmease commented Mar 20, 2025 •
edited
Loading

That's way better, thanks! :)

@bors r+ rollup (err path)

@bors
Copy link
Collaborator

bors commented Mar 20, 2025

📌 Commit 220851c has been approved by fmease

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 20, 2025
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 20, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 20, 2025
@bors
Auto merge of rust-lang#138747 - matthiaskrgr:rollup-68x44rw, r=matth…
1a07777 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#138435 (Add support for postfix yield expressions)
 - rust-lang#138685 (Use `Option<Ident>` for lowered param names.)
 - rust-lang#138700 (Suggest `-Whelp` when pass `--print lints` to rustc)
 - rust-lang#138727 (Do not rely on `type_var_origin` in `OrphanCheckErr::NonLocalInputType`)
 - rust-lang#138729 (Clean up `FnCtxt::resolve_coroutine_interiors`)
 - rust-lang#138731 (coverage: Add LLVM plumbing for expansion regions)
 - rust-lang#138732 (Use `def_path_str` for def id arg in `UnsupportedOpInfo`)
 - rust-lang#138735 (Remove `llvm` and `llvms` triagebot ping aliases for `icebreakers-llvm` ping group)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 20, 2025
@matthiaskrgr
Rollup merge of rust-lang#138727 - compiler-errors:ty-var-origin, r=f…
4659493 
…mease

Do not rely on `type_var_origin` in `OrphanCheckErr::NonLocalInputType`

The ordering of ty var unification means that we may end up with a root variable whose ty var origin is from another item's params.

Let's not rely on this by just unifying the infer vars with the params of the impl + resolving. It's kinda goofy but it's clearer IMO.

Fixes rust-lang#132826.

r? ``@fmease`` or ``@lcnr``
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 20, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 20, 2025
@bors
Auto merge of rust-lang#138747 - matthiaskrgr:rollup-68x44rw, r=matth…
eda7820 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#138435 (Add support for postfix yield expressions)
 - rust-lang#138685 (Use `Option<Ident>` for lowered param names.)
 - rust-lang#138700 (Suggest `-Whelp` when pass `--print lints` to rustc)
 - rust-lang#138727 (Do not rely on `type_var_origin` in `OrphanCheckErr::NonLocalInputType`)
 - rust-lang#138729 (Clean up `FnCtxt::resolve_coroutine_interiors`)
 - rust-lang#138731 (coverage: Add LLVM plumbing for expansion regions)
 - rust-lang#138732 (Use `def_path_str` for def id arg in `UnsupportedOpInfo`)
 - rust-lang#138735 (Remove `llvm` and `llvms` triagebot ping aliases for `icebreakers-llvm` ping group)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3e04973 into rust-lang:master Mar 21, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 21, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2025
@rust-timer
Unrolled build for rust-lang#138727
6102cbb 
Rollup merge of rust-lang#138727 - compiler-errors:ty-var-origin, r=fmease

Do not rely on `type_var_origin` in `OrphanCheckErr::NonLocalInputType`

The ordering of ty var unification means that we may end up with a root variable whose ty var origin is from another item's params.

Let's not rely on this by just unifying the infer vars with the params of the impl + resolving. It's kinda goofy but it's clearer IMO.

Fixes rust-lang#132826.

r? `@fmease` or `@lcnr`
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2025
@bors
Auto merge of rust-lang#138760 - matthiaskrgr:rollup-2edtg2h, r=matth…
01dc45c 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#138435 (Add support for postfix yield expressions)
 - rust-lang#138685 (Use `Option<Ident>` for lowered param names.)
 - rust-lang#138700 (Suggest `-Whelp` when pass `--print lints` to rustc)
 - rust-lang#138727 (Do not rely on `type_var_origin` in `OrphanCheckErr::NonLocalInputType`)
 - rust-lang#138729 (Clean up `FnCtxt::resolve_coroutine_interiors`)
 - rust-lang#138731 (coverage: Add LLVM plumbing for expansion regions)
 - rust-lang#138732 (Use `def_path_str` for def id arg in `UnsupportedOpInfo`)
 - rust-lang#138735 (Remove `llvm` and `llvms` triagebot ping aliases for `icebreakers-llvm` ping group)

r? `@ghost`
`@rustbot` modify labels: rollup
@fmease fmease mentioned this pull request Mar 21, 2025
Closed
flip1995 pushed a commit to flip1995/rust that referenced this pull request Apr 3, 2025
@bors
Auto merge of rust-lang#138747 - matthiaskrgr:rollup-68x44rw, r=matth…
c128221 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#138435 (Add support for postfix yield expressions)
 - rust-lang#138685 (Use `Option<Ident>` for lowered param names.)
 - rust-lang#138700 (Suggest `-Whelp` when pass `--print lints` to rustc)
 - rust-lang#138727 (Do not rely on `type_var_origin` in `OrphanCheckErr::NonLocalInputType`)
 - rust-lang#138729 (Clean up `FnCtxt::resolve_coroutine_interiors`)
 - rust-lang#138731 (coverage: Add LLVM plumbing for expansion regions)
 - rust-lang#138732 (Use `def_path_str` for def id arg in `UnsupportedOpInfo`)
 - rust-lang#138735 (Remove `llvm` and `llvms` triagebot ping aliases for `icebreakers-llvm` ping group)

r? `@ghost`
`@rustbot` modify labels: rollup
flip1995 pushed a commit to flip1995/rust that referenced this pull request Apr 3, 2025
@bors
Auto merge of rust-lang#138760 - matthiaskrgr:rollup-2edtg2h, r=matth…
25f1f90 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#138435 (Add support for postfix yield expressions)
 - rust-lang#138685 (Use `Option<Ident>` for lowered param names.)
 - rust-lang#138700 (Suggest `-Whelp` when pass `--print lints` to rustc)
 - rust-lang#138727 (Do not rely on `type_var_origin` in `OrphanCheckErr::NonLocalInputType`)
 - rust-lang#138729 (Clean up `FnCtxt::resolve_coroutine_interiors`)
 - rust-lang#138731 (coverage: Add LLVM plumbing for expansion regions)
 - rust-lang#138732 (Use `def_path_str` for def id arg in `UnsupportedOpInfo`)
 - rust-lang#138735 (Remove `llvm` and `llvms` triagebot ping aliases for `icebreakers-llvm` ping group)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmease fmease fmease approved these changes

Assignees

@fmease fmease

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
1.87.0
Development

Successfully merging this pull request may close these issues.

Using a trait's Associated Type in a different trait's impl declaration crashes
4 participants
@compiler-errors @rustbot @fmease @bors