Skip to content

-Znext-solver Emit error instead of ICE when combining {int, float} var with alias#158084

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
ShoyuVanilla:issue-158064
Jun 19, 2026
Merged

-Znext-solver Emit error instead of ICE when combining {int, float} var with alias#158084
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
ShoyuVanilla:issue-158064

Conversation

@ShoyuVanilla

Copy link
Copy Markdown
Member

Fixes #158064

r? 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 Jun 18, 2026
match relation.structurally_relate_aliases() {
StructurallyRelateAliases::Yes => structurally_relate_tys(relation, a, b),
StructurallyRelateAliases::Yes => match other {
ty::Infer(_) => Err(TypeError::Sorts(ExpectedFound::new(a, b))),

@lcnr lcnr Jun 18, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you make it an exhaustive match on just int/float vars?
and the other infer var kinds as unreachable?

also pls a quick comment explaining why we need to do this

View changes since the review

@lcnr lcnr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, otherwise sgtm :>

View changes since this review

@lcnr

lcnr commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@rust-bors

rust-bors Bot commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

📌 Commit b130dd1 has been approved by lcnr

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 5. This pull request will be tested once the tree is reopened.

@rust-bors rust-bors Bot 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 Jun 19, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 19, 2026
`-Znext-solver` Emit error instead of ICE when combining {int, float} var with alias

Fixes rust-lang#158064

r? lcnr
rust-bors Bot pushed a commit that referenced this pull request Jun 19, 2026
…uwer

Rollup of 4 pull requests

Successful merges:

 - #157926 (Implement `#[diagnostic::on_unknown]` for modules.)
 - #158084 (`-Znext-solver` Emit error instead of ICE when combining {int, float} var with alias)
 - #158128 (std: use correct low surrogate range in Windows standard I/O code)
 - #158132 (std: correctly report file size on UWP)
jhpratt added a commit to jhpratt/rust that referenced this pull request Jun 19, 2026
`-Znext-solver` Emit error instead of ICE when combining {int, float} var with alias

Fixes rust-lang#158064

r? lcnr
rust-bors Bot pushed a commit that referenced this pull request Jun 19, 2026
…uwer

Rollup of 8 pull requests

Successful merges:

 - #158129 (ensure the new solver bootstraps on CI)
 - #158134 (Rename `lint-rust-version` to `hint-msrv`)
 - #157926 (Implement `#[diagnostic::on_unknown]` for modules.)
 - #158075 (Point to the unstable segment of an import path instead of to the whole path)
 - #158084 (`-Znext-solver` Emit error instead of ICE when combining {int, float} var with alias)
 - #158128 (std: use correct low surrogate range in Windows standard I/O code)
 - #158132 (std: correctly report file size on UWP)
 - #158138 (Remove redundant check for `#[loop_match]` and `#[const_continue]`)
@rust-bors rust-bors Bot merged commit b2b7df3 into rust-lang:main Jun 19, 2026
13 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jun 19, 2026
rust-timer added a commit that referenced this pull request Jun 19, 2026
Rollup merge of #158084 - ShoyuVanilla:issue-158064, r=lcnr

`-Znext-solver` Emit error instead of ICE when combining {int, float} var with alias

Fixes #158064

r? lcnr
@ShoyuVanilla ShoyuVanilla deleted the issue-158064 branch June 20, 2026 00:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

[ICE]: next solver regression var types encountered in structurally_relate_tys

3 participants