Uplift the (new solver) canonicalizer into `rustc_next_trait_solver` #117586

compiler-errors · 2023-11-04T19:02:05Z

Uplifts the new trait solver's canonicalizer into a new crate called rustc_next_trait_solver.

The crate name is literally a bikeshed-avoidance name, so let's not block this PR on that -- renames are welcome later.

There are a host of other changes that were required to make this possible:

Expose a ConstTy trait to get the Interner::Ty from a Interner::Const.
Expose some constructor methods to construct Bound variants. These are currently methods defined on the interner themselves, but they could be pulled into traits later.
Expose a IntoKind trait to turn a Ty/Const/Region into their corresponding *Kinds.
Some minor tweaks to other APIs in rustc_type_ir.

The canonicalizer code itself is best reviewed with whitespace ignored.

bors · 2023-11-05T00:07:50Z

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

rustbot · 2023-11-22T23:50:42Z

Some changes occurred to the core trait solver

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

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

compiler/rustc_next_trait_solver/src/canonicalizer.rs

bors · 2023-11-25T13:53:04Z

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

lcnr

I am fairly unhappy with using Clone instead of Copy. However, r-a seems to be using Arc<T> for interning, going to open a convo on zulip https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer/topic/interning.20and.20requiring.20.60Copy.60

compiler/rustc_middle/src/ty/consts.rs

compiler/rustc_middle/src/ty/context.rs

compiler/rustc_middle/src/ty/mod.rs

compiler/rustc_next_trait_solver/src/canonicalizer.rs

compiler/rustc_type_ir/src/canonical.rs

compiler/rustc_type_ir/src/infcx.rs

lcnr · 2023-12-01T21:02:15Z

After talking about this on zulip, I think we should go with requiring Copy for now, switching to Clone if necessary.

compiler-errors · 2023-12-05T18:59:27Z

The only feedback I did not integrate was the:

trait InferCtxtLike {
  type Interner: Interner<Ty = Self::Ty>;
  type Ty: Bound + Bound + Bound + ...;

Because:

It's not possible to uplift Binder<T> like this because it would require expressing a for<T> bound, and
It's not that much better imo.

@rustbot ready

lcnr

r=me after nit

compiler/rustc_middle/src/ty/context.rs

compiler/rustc_next_trait_solver/src/canonicalizer.rs

compiler-errors · 2023-12-07T19:10:42Z

@bors r=lcnr

bors · 2023-12-07T19:10:45Z

📌 Commit 1c1df45 has been approved by lcnr

It is now in the queue for this repository.

… r=lcnr Uplift the (new solver) canonicalizer into `rustc_next_trait_solver` Uplifts the new trait solver's canonicalizer into a new crate called `rustc_next_trait_solver`. The crate name is literally a bikeshed-avoidance name, so let's not block this PR on that -- renames are welcome later. There are a host of other changes that were required to make this possible: * Expose a `ConstTy` trait to get the `Interner::Ty` from a `Interner::Const`. * Expose some constructor methods to construct `Bound` variants. These are currently methods defined on the interner themselves, but they could be pulled into traits later. * Expose a `IntoKind` trait to turn a `Ty`/`Const`/`Region` into their corresponding `*Kind`s. * Some minor tweaks to other APIs in `rustc_type_ir`. The canonicalizer code itself is best reviewed **with whitespace ignored.** r? `@lcnr`

bors · 2023-12-07T21:13:31Z

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

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#116420 (discard invalid spans in external blocks) - rust-lang#118686 (Only check principal trait ref for object safety) - rust-lang#118688 (Add method to get type of an Rvalue in StableMIR) - rust-lang#118707 (Ping GuillaumeGomez for changes in rustc_codegen_gcc) - rust-lang#118712 (targets: remove not-added {i386,i486}-unknown-linux-gnu) - rust-lang#118719 (CFI: Add char to CFI integer normalization) Failed merges: - rust-lang#117586 (Uplift the (new solver) canonicalizer into `rustc_next_trait_solver`) r? `@ghost` `@rustbot` modify labels: rollup

- Take more things by self, not &self - Clone more things - Rework namespacing so we can use `ty::` in the canonicalizer

compiler-errors · 2023-12-08T17:44:16Z

@bors r=lcnr

bors · 2023-12-08T17:44:18Z

📌 Commit 80f240a has been approved by lcnr

It is now in the queue for this repository.

… r=lcnr Uplift the (new solver) canonicalizer into `rustc_next_trait_solver` Uplifts the new trait solver's canonicalizer into a new crate called `rustc_next_trait_solver`. The crate name is literally a bikeshed-avoidance name, so let's not block this PR on that -- renames are welcome later. There are a host of other changes that were required to make this possible: * Expose a `ConstTy` trait to get the `Interner::Ty` from a `Interner::Const`. * Expose some constructor methods to construct `Bound` variants. These are currently methods defined on the interner themselves, but they could be pulled into traits later. * Expose a `IntoKind` trait to turn a `Ty`/`Const`/`Region` into their corresponding `*Kind`s. * Some minor tweaks to other APIs in `rustc_type_ir`. The canonicalizer code itself is best reviewed **with whitespace ignored.** r? `@lcnr`

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#117586 (Uplift the (new solver) canonicalizer into `rustc_next_trait_solver`) - rust-lang#118692 (remove redundant imports) - rust-lang#118694 (Add instance evaluation and methods to read an allocation in StableMIR) - rust-lang#118715 (privacy: visit trait def id of projections) - rust-lang#118730 (recurse into refs when comparing tys for diagnostics) - rust-lang#118736 (temporarily revert "ice on ambguity in mir typeck") r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#117586 (Uplift the (new solver) canonicalizer into `rustc_next_trait_solver`) - rust-lang#118502 (fix: correct the arg for 'suggest to use associated function syntax' diagnostic) - rust-lang#118694 (Add instance evaluation and methods to read an allocation in StableMIR) - rust-lang#118715 (privacy: visit trait def id of projections) - rust-lang#118730 (recurse into refs when comparing tys for diagnostics) - rust-lang#118736 (temporarily revert "ice on ambguity in mir typeck") r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#117586 - compiler-errors:the-canonicalizer, r=lcnr Uplift the (new solver) canonicalizer into `rustc_next_trait_solver` Uplifts the new trait solver's canonicalizer into a new crate called `rustc_next_trait_solver`. The crate name is literally a bikeshed-avoidance name, so let's not block this PR on that -- renames are welcome later. There are a host of other changes that were required to make this possible: * Expose a `ConstTy` trait to get the `Interner::Ty` from a `Interner::Const`. * Expose some constructor methods to construct `Bound` variants. These are currently methods defined on the interner themselves, but they could be pulled into traits later. * Expose a `IntoKind` trait to turn a `Ty`/`Const`/`Region` into their corresponding `*Kind`s. * Some minor tweaks to other APIs in `rustc_type_ir`. The canonicalizer code itself is best reviewed **with whitespace ignored.** r? ``@lcnr``

rustbot assigned lcnr Nov 4, 2023

compiler-errors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 4, 2023

This comment has been minimized.

Sign in to view

rust-cloud-vms bot force-pushed the the-canonicalizer branch from 5a0f412 to df5459a Compare November 22, 2023 19:49

This comment has been minimized.

Sign in to view

rust-cloud-vms bot force-pushed the the-canonicalizer branch from df5459a to 895f141 Compare November 22, 2023 23:45

compiler-errors marked this pull request as ready for review November 22, 2023 23:50

compiler-errors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 22, 2023

compiler-errors commented Nov 22, 2023

View reviewed changes

compiler/rustc_next_trait_solver/src/canonicalizer.rs Outdated Show resolved Hide resolved

compiler-errors changed the title ~~Uplift the (new solver) canonicalizer into rustc_type_ir~~ Uplift the (new solver) canonicalizer into rustc_next_trait_solver Nov 23, 2023

compiler-errors force-pushed the the-canonicalizer branch from 895f141 to a79bcfc Compare November 25, 2023 18:42

lcnr reviewed Nov 29, 2023

View reviewed changes

rust-cloud-vms bot force-pushed the the-canonicalizer branch from a79bcfc to aa30616 Compare December 5, 2023 18:55

lcnr reviewed Dec 6, 2023

View reviewed changes

compiler/rustc_middle/src/ty/context.rs Show resolved Hide resolved

compiler/rustc_next_trait_solver/src/canonicalizer.rs Outdated Show resolved Hide resolved

rust-cloud-vms bot force-pushed the the-canonicalizer branch from 43eb7e3 to 1c1df45 Compare December 7, 2023 19:10

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 7, 2023

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 7, 2023

compiler-errors mentioned this pull request Dec 7, 2023

Rollup of 8 pull requests #118720

Closed

matthiaskrgr mentioned this pull request Dec 7, 2023

Rollup of 6 pull requests #118723

Merged

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 Dec 7, 2023

compiler-errors added 3 commits December 8, 2023 17:44

Uplift canonicalizer into new trait solver crate

cb41509

Feedback

1f5895b

- Take more things by self, not &self - Clone more things - Rework namespacing so we can use `ty::` in the canonicalizer

Make it not depend on nightly conditionally

80f240a

rust-cloud-vms bot force-pushed the the-canonicalizer branch from 1c1df45 to 80f240a Compare December 8, 2023 17:44

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 Dec 8, 2023

matthiaskrgr mentioned this pull request Dec 8, 2023

Rollup of 6 pull requests #118757

Closed

matthiaskrgr mentioned this pull request Dec 8, 2023

Rollup of 6 pull requests #118763

Merged

bors merged commit 4df6134 into rust-lang:master Dec 9, 2023

rustbot added this to the 1.76.0 milestone Dec 9, 2023

matthiaskrgr mentioned this pull request Dec 14, 2023

ICE: region vid should have been resolved fully before canonicalization #118950

Closed

Uplift the (new solver) canonicalizer into rustc_next_trait_solver #117586

Uplift the (new solver) canonicalizer into rustc_next_trait_solver #117586

Uh oh!

Conversation

compiler-errors commented Nov 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

bors commented Nov 5, 2023

Uh oh!

This comment has been minimized.

rustbot commented Nov 22, 2023

Uh oh!

Uh oh!

bors commented Nov 25, 2023

Uh oh!

lcnr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lcnr commented Dec 1, 2023

Uh oh!

compiler-errors commented Dec 5, 2023

Uh oh!

lcnr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

compiler-errors commented Dec 7, 2023

Uh oh!

bors commented Dec 7, 2023

Uh oh!

bors commented Dec 7, 2023

Uh oh!

compiler-errors commented Dec 8, 2023

Uh oh!

bors commented Dec 8, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uplift the (new solver) canonicalizer into `rustc_next_trait_solver` #117586

Uplift the (new solver) canonicalizer into `rustc_next_trait_solver` #117586

compiler-errors commented Nov 4, 2023 •

edited

Loading