Uplift `Canonical` to `rustc_type_ir` #117008

compiler-errors · 2023-10-21T04:21:16Z

I plan on moving the new trait solver's canonicalizer into either rustc_type_ir or a child crate. One dependency on this is lifting Canonical<V> to rustc_type_ir so we can actually name the canonicalized values.

I may also later lift CanonicalVarInfo into the new trait solver. I can't really tell what other changes need to be done, but I'm just putting this up sooner than later since I'm almost certain it'll need to be done regardless of other design choices.

There are a couple of warts introduced by this PR, since we no longer can define inherent Canonical impls in rustc_middle -- see the changes to:

compiler/rustc_trait_selection/src/traits/query/normalize.rs
compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

r? lcnr

lcnr

r=me after review

lcnr · 2023-10-23T08:13:45Z

compiler/rustc_middle/src/ty/typeck_results.rs

@@ -594,11 +594,24 @@ pub struct CanonicalUserTypeAnnotation<'tcx> {
 /// Canonical user type annotation.
 pub type CanonicalUserType<'tcx> = Canonical<'tcx, UserType<'tcx>>;

-impl<'tcx> CanonicalUserType<'tcx> {


I would prefer using an extension trait I think, UserType::is_identity seems wrong and easy to misuse

rustbot · 2023-10-23T20:10:53Z

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-errors · 2023-10-23T23:28:10Z

@bors r=lcnr

bors · 2023-10-23T23:28:12Z

📌 Commit 7279f7e has been approved by lcnr

It is now in the queue for this repository.

bors · 2023-10-25T07:51:25Z

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

compiler-errors · 2023-10-25T16:50:06Z

rebased

@bors r=lcnr

bors · 2023-10-25T16:50:09Z

📌 Commit 8f3b4f9 has been approved by lcnr

It is now in the queue for this repository.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#116401 (Return multiple object-safety violation errors and code improvements to the object-safety check) - rust-lang#116553 (Do not suggest 'Trait<Assoc=arg>' when in trait impl) - rust-lang#116931 (Improve the warning messages for the `#[diagnostic::on_unimplemented]`) - rust-lang#117008 (Uplift `Canonical` to `rustc_type_ir`) - rust-lang#117009 (On unresolved imports, suggest a disambiguated path if necessary to avoid collision with local items) - rust-lang#117175 (Rename AsyncCoroutineKind to CoroutineSource) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#117008 - compiler-errors:canonical, r=lcnr Uplift `Canonical` to `rustc_type_ir` I plan on moving the new trait solver's canonicalizer into either `rustc_type_ir` or a child crate. One dependency on this is lifting `Canonical<V>` to `rustc_type_ir` so we can actually name the canonicalized values. I may also later lift `CanonicalVarInfo` into the new trait solver. I can't really tell what other changes need to be done, but I'm just putting this up sooner than later since I'm almost certain it'll need to be done regardless of other design choices. There are a couple of warts introduced by this PR, since we no longer can define inherent `Canonical` impls in `rustc_middle` -- see the changes to: * `compiler/rustc_trait_selection/src/traits/query/normalize.rs` * `compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs` r? lcnr

rustbot assigned lcnr Oct 21, 2023

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. labels Oct 21, 2023

lcnr reviewed Oct 23, 2023

View reviewed changes

compiler-errors force-pushed the canonical branch from 2b63d6b to fed357e Compare October 23, 2023 20:10

compiler-errors force-pushed the canonical branch from fed357e to 7279f7e Compare October 23, 2023 20:11

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 Oct 23, 2023

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 Oct 25, 2023

compiler-errors added 2 commits October 25, 2023 16:25

Uplift Canonical to rustc_type_ir

024ca99

Add a IsIdentity extension trait for CanonicalUserType

8f3b4f9

rust-cloud-vms bot force-pushed the canonical branch from 7279f7e to 8f3b4f9 Compare October 25, 2023 16:50

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 Oct 25, 2023

matthiaskrgr mentioned this pull request Oct 25, 2023

Rollup of 6 pull requests #117193

Merged

bors merged commit f783ce9 into rust-lang:master Oct 26, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 26, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

jackh726 mentioned this pull request Nov 30, 2023

Tracking issue for shared type library rust-lang/types-team#16

Open

26 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uplift `Canonical` to `rustc_type_ir` #117008

Uplift `Canonical` to `rustc_type_ir` #117008

compiler-errors commented Oct 21, 2023

lcnr left a comment

lcnr Oct 23, 2023

compiler-errors Oct 23, 2023

rustbot commented Oct 23, 2023

compiler-errors commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 25, 2023

compiler-errors commented Oct 25, 2023

bors commented Oct 25, 2023

Uplift Canonical to rustc_type_ir #117008

Uplift Canonical to rustc_type_ir #117008

Conversation

compiler-errors commented Oct 21, 2023

lcnr left a comment

Choose a reason for hiding this comment

lcnr Oct 23, 2023

Choose a reason for hiding this comment

compiler-errors Oct 23, 2023

Choose a reason for hiding this comment

rustbot commented Oct 23, 2023

compiler-errors commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 25, 2023

compiler-errors commented Oct 25, 2023

bors commented Oct 25, 2023

Uplift `Canonical` to `rustc_type_ir` #117008

Uplift `Canonical` to `rustc_type_ir` #117008