Skip to content

rustc_next_trait_solver: canonical out of EvalCtxt#146638

Merged
bors merged 2 commits intorust-lang:masterfrom
lcnr:canonical-separate-module
Sep 19, 2025
Merged

rustc_next_trait_solver: canonical out of EvalCtxt#146638
bors merged 2 commits intorust-lang:masterfrom
lcnr:canonical-separate-module

Conversation

@lcnr
Copy link
Contributor

@lcnr lcnr commented Sep 16, 2025 •
edited
Loading

we need to canonicalize outside of the trait solver as well, so it's just a lot nicer if canonicalization is more easily accessible

if you review it commit by commit the move is properly shown

@rustbot
Copy link
Collaborator

rustbot commented Sep 16, 2025

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@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 Sep 16, 2025
@rustbot
Copy link
Collaborator

rustbot commented Sep 16, 2025

r? @fee1-dead

rustbot has assigned @fee1-dead.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@BoxyUwU
Copy link
Member

BoxyUwU commented Sep 16, 2025

r? @BoxyUwU

@rustbot rustbot assigned BoxyUwU and unassigned fee1-dead Sep 16, 2025
@bors
Copy link
Collaborator

bors commented Sep 18, 2025

☔ The latest upstream changes (presumably #146698) made this pull request unmergeable. Please resolve the merge conflicts.

@lcnr lcnr force-pushed the canonical-separate-module branch from 3e3af5e to caa248b Compare September 18, 2025 09:15
@rustbot

This comment has been minimized.

Sign in to view
@BoxyUwU
Copy link
Member

BoxyUwU commented Sep 18, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 18, 2025

📌 Commit caa248b has been approved by BoxyUwU

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 Sep 18, 2025
@BoxyUwU BoxyUwU added the S-no-work-capacity-tracking Status: Exempted from triagebot work capacity tracking. label Sep 18, 2025
@bors
Copy link
Collaborator

bors commented Sep 18, 2025

☔ The latest upstream changes (presumably #145993) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 18, 2025
@BoxyUwU
Copy link
Member

BoxyUwU commented Sep 18, 2025

@bors r- xd

@lcnr lcnr force-pushed the canonical-separate-module branch from caa248b to 74f5635 Compare September 18, 2025 21:54
@rustbot
Copy link
Collaborator

rustbot commented Sep 18, 2025

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@lcnr
Copy link
Contributor Author

lcnr commented Sep 18, 2025

@bors r=BoxyUwU

@bors
Copy link
Collaborator

bors commented Sep 18, 2025

📌 Commit 74f5635 has been approved by BoxyUwU

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 18, 2025
@lcnr lcnr force-pushed the canonical-separate-module branch from 74f5635 to b83c0f0 Compare September 18, 2025 21:56
@lcnr
Copy link
Contributor Author

lcnr commented Sep 18, 2025

@bors r=BoxyUwU

@bors
Copy link
Collaborator

bors commented Sep 18, 2025

📌 Commit b83c0f0 has been approved by BoxyUwU

It is now in the queue for this repository.

jhpratt added a commit to jhpratt/rust that referenced this pull request Sep 19, 2025
@jhpratt
Rollup merge of rust-lang#146638 - lcnr:canonical-separate-module, r=…
3834bf3 
…BoxyUwU

`rustc_next_trait_solver`: canonical out of `EvalCtxt`

we need to canonicalize outside of the trait solver as well, so it's just a lot nicer if canonicalization is more easily accessible

if you review it commit by commit the move is properly shown
@jhpratt jhpratt mentioned this pull request Sep 19, 2025
Closed
bors added a commit that referenced this pull request Sep 19, 2025
@bors
Auto merge of #146746 - jhpratt:rollup-1nblzea, r=jhpratt
b507807 
Rollup of 8 pull requests

Successful merges:

 - #146229 (Automatically switch to lto-fat when flag RUSTFLAGS="- Zautodiff=Enable" is set)
 - #146615 (rustc_codegen_llvm: Feature Conversion Tidying)
 - #146638 (`rustc_next_trait_solver`: canonical out of `EvalCtxt`)
 - #146663 (Allow windows resource compiler to be overridden)
 - #146691 (std: Fix WASI implementation of `remove_dir_all`)
 - #146709 (stdarch subtree update)
 - #146731 (test: Use SVG for terminal url test)
 - #146738 (Fix tidy spellchecking on Windows)

r? `@ghost`
`@rustbot` modify labels: rollup
Zalathar added a commit to Zalathar/rust that referenced this pull request Sep 19, 2025
@Zalathar
Rollup merge of rust-lang#146638 - lcnr:canonical-separate-module, r=…
c253941 
…BoxyUwU

`rustc_next_trait_solver`: canonical out of `EvalCtxt`

we need to canonicalize outside of the trait solver as well, so it's just a lot nicer if canonicalization is more easily accessible

if you review it commit by commit the move is properly shown
@Zalathar Zalathar mentioned this pull request Sep 19, 2025
Closed
@lnicola lnicola mentioned this pull request Sep 19, 2025
Closed
@Zalathar Zalathar mentioned this pull request Sep 19, 2025
Merged
bors added a commit that referenced this pull request Sep 19, 2025
@bors
Auto merge of #146765 - Zalathar:rollup-ewh4s9o, r=Zalathar
5904356 
Rollup of 10 pull requests

Successful merges:

 - #146229 (Automatically switch to lto-fat when flag RUSTFLAGS="- Zautodiff=Enable" is set)
 - #146484 (rustdoc-search: JavaScript optimization based on Firefox Profiler output)
 - #146541 (std: simplify host lookup)
 - #146615 (rustc_codegen_llvm: Feature Conversion Tidying)
 - #146638 (`rustc_next_trait_solver`: canonical out of `EvalCtxt`)
 - #146663 (Allow windows resource compiler to be overridden)
 - #146691 (std: Fix WASI implementation of `remove_dir_all`)
 - #146709 (stdarch subtree update)
 - #146738 (Fix tidy spellchecking on Windows)
 - #146740 (miri subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit aa2bb56 into rust-lang:master Sep 19, 2025
10 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Sep 19, 2025
rust-timer added a commit that referenced this pull request Sep 19, 2025
@rust-timer
Unrolled build for #146638
345a7f1 
Rollup merge of #146638 - lcnr:canonical-separate-module, r=BoxyUwU

`rustc_next_trait_solver`: canonical out of `EvalCtxt`

we need to canonicalize outside of the trait solver as well, so it's just a lot nicer if canonicalization is more easily accessible

if you review it commit by commit the move is properly shown
@lcnr lcnr deleted the canonical-separate-module branch September 19, 2025 20:24
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Sep 20, 2025
@bors
Auto merge of #146765 - Zalathar:rollup-ewh4s9o, r=Zalathar
8e4455b 
Rollup of 10 pull requests

Successful merges:

 - rust-lang/rust#146229 (Automatically switch to lto-fat when flag RUSTFLAGS="- Zautodiff=Enable" is set)
 - rust-lang/rust#146484 (rustdoc-search: JavaScript optimization based on Firefox Profiler output)
 - rust-lang/rust#146541 (std: simplify host lookup)
 - rust-lang/rust#146615 (rustc_codegen_llvm: Feature Conversion Tidying)
 - rust-lang/rust#146638 (`rustc_next_trait_solver`: canonical out of `EvalCtxt`)
 - rust-lang/rust#146663 (Allow windows resource compiler to be overridden)
 - rust-lang/rust#146691 (std: Fix WASI implementation of `remove_dir_all`)
 - rust-lang/rust#146709 (stdarch subtree update)
 - rust-lang/rust#146738 (Fix tidy spellchecking on Windows)
 - rust-lang/rust#146740 (miri subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
Muscraft pushed a commit to Muscraft/rust that referenced this pull request Sep 24, 2025
@Zalathar @Muscraft
Rollup merge of rust-lang#146638 - lcnr:canonical-separate-module, r=…
a2c5d0f 
…BoxyUwU

`rustc_next_trait_solver`: canonical out of `EvalCtxt`

we need to canonicalize outside of the trait solver as well, so it's just a lot nicer if canonicalization is more easily accessible

if you review it commit by commit the move is properly shown
Muscraft pushed a commit to Muscraft/rust that referenced this pull request Sep 24, 2025
@bors @Muscraft
Auto merge of rust-lang#146765 - Zalathar:rollup-ewh4s9o, r=Zalathar
90ac24c 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#146229 (Automatically switch to lto-fat when flag RUSTFLAGS="- Zautodiff=Enable" is set)
 - rust-lang#146484 (rustdoc-search: JavaScript optimization based on Firefox Profiler output)
 - rust-lang#146541 (std: simplify host lookup)
 - rust-lang#146615 (rustc_codegen_llvm: Feature Conversion Tidying)
 - rust-lang#146638 (`rustc_next_trait_solver`: canonical out of `EvalCtxt`)
 - rust-lang#146663 (Allow windows resource compiler to be overridden)
 - rust-lang#146691 (std: Fix WASI implementation of `remove_dir_all`)
 - rust-lang#146709 (stdarch subtree update)
 - rust-lang#146738 (Fix tidy spellchecking on Windows)
 - rust-lang#146740 (miri subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
Kobzol pushed a commit to Kobzol/stdarch that referenced this pull request Nov 2, 2025
@bors
Auto merge of #146765 - Zalathar:rollup-ewh4s9o, r=Zalathar
df1830c 
Rollup of 10 pull requests

Successful merges:

 - rust-lang/rust#146229 (Automatically switch to lto-fat when flag RUSTFLAGS="- Zautodiff=Enable" is set)
 - rust-lang/rust#146484 (rustdoc-search: JavaScript optimization based on Firefox Profiler output)
 - rust-lang/rust#146541 (std: simplify host lookup)
 - rust-lang/rust#146615 (rustc_codegen_llvm: Feature Conversion Tidying)
 - rust-lang/rust#146638 (`rustc_next_trait_solver`: canonical out of `EvalCtxt`)
 - rust-lang/rust#146663 (Allow windows resource compiler to be overridden)
 - rust-lang/rust#146691 (std: Fix WASI implementation of `remove_dir_all`)
 - rust-lang/rust#146709 (stdarch subtree update)
 - rust-lang/rust#146738 (Fix tidy spellchecking on Windows)
 - rust-lang/rust#146740 (miri subtree update)

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

No reviews

Assignees

@BoxyUwU BoxyUwU

Labels

S-no-work-capacity-tracking Status: Exempted from triagebot work capacity tracking. 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.92.0

Development

Successfully merging this pull request may close these issues.

5 participants

@lcnr @rustbot @BoxyUwU @bors @fee1-dead