Uplift `Relate`/`TypeRelation` into `rustc_next_trait_solver` #125724

compiler-errors · 2024-05-29T14:57:27Z

For use in the new solver. This doesn't yet uplift ObligationEmittingRelation.

r? lcnr

rustbot · 2024-05-29T14:57:36Z

changes to the core type system

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 · 2024-05-29T14:59:47Z

One structure question: Currently this uplifts TypeRelation and Relate into rustc_next_trait_solver. This is actually somewhat problematic, since I would eventually like to make InferCtxtLike have a eq<T: Relate<Self>>() method, but InferCtxtLike is defined in rustc_type_ir:

~~We may need to move InferCtxtLike down rustc_next_trait_solver (which affects the ability to use DebugWithInfcx)~~
Or alternatively, we need to move relations up into rustc_type_ir.

edit: I just ended up uplifting relations into rustc_type_ir. We can fix this later by moving it down if desired, it's not a lot of work.

compiler-errors · 2024-05-30T02:54:29Z

compiler/rustc_type_ir/src/relate.rs

+    b_arg: I::GenericArgs,
+) -> RelateResult<I, I::GenericArgs>
+where
+    I::GenericArg: Relate<Infcx>,


Actually, I think this makes it pretty obvious that Relate needs to be parameterized over Interner, not InferCtxt.

We want to be able to add the bound:

trait Interner { type GenericArg: ... + Relate<Self>; // ++++++++++++ }

which we can't do if Relate is generic over Infcx :/

trait Sup { type Assoc; } trait Trait: Sup<Assoc: Copy> {} fn foo<T: Trait>(x: T::Assoc) -> (T::Assoc, T::Assoc) { (x, x) }

tbh I am actually surpised that that works, don't fully understand why it does

Can add

trait Interner { type GenericArg; } // To allow an impl in `rustc_infer` while still having super traits trait InternerForInfcx<Infcx: ?Sized>: Interner<GenericArg: Relate<Infcx>> {} trait InferCtxtLike { type Interner: InternerForInfcx<Self>; } fn foo<Infcx: InferCtxtLike<Interner = I>, I: InternerForInfcx<Infcx>>() {}

:3

edit: this will make rustc a ParamEnv stress test however, because now every function with an InternerForInfcx<Infcx> bound will have a lot of caller_bounds

compiler-errors · 2024-05-30T02:54:46Z

@rustbot author

bors · 2024-05-30T08:00:50Z

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

lcnr

stopped reviewing after getting to the comment in relate.rs

as a general note: would you mind moving some of the param bounds into where-bounds, I personally find multi-line generic param listings hard to read

lcnr · 2024-05-30T12:22:35Z

compiler/rustc_type_ir/src/const_kind.rs

+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "nightly", derive(HashStable_NoContext, TyEncodable, TyDecodable))]
+pub enum BoundConstness {


idk how I feel about BoundConstness being part of const_kind, maybe move it to const_trait module or sth?

lcnr · 2024-05-30T12:23:02Z

compiler/rustc_type_ir/src/error.rs

+    /// type).
+    CyclicTy(I::Ty),
+    CyclicConst(I::Const),
+    ProjectionMismatched(ExpectedFound<I::DefId>),


Suggested change

ProjectionMismatched(ExpectedFound<I::DefId>),

ProjectionMismatch(ExpectedFound<I::DefId>),

idk if you want to fix it in this PR

lcnr · 2024-05-30T12:23:52Z

compiler/rustc_type_ir/src/error.rs

+#[derive(TypeVisitable_Generic)]
+#[rustc_pass_by_value]
+pub enum TypeError<I: Interner> {
+    Mismatch,


not for this PR

Suggested change

Mismatch,

Misc,

lcnr · 2024-05-30T12:26:55Z

compiler/rustc_type_ir/src/relate.rs

+    /// Returns a static string we can use for printouts.
+    fn tag(&self) -> &'static str;


not necessarily for this PR. Remove this and just use std::any::type_name for debug printing instead

lcnr · 2024-05-30T12:35:56Z

compiler/rustc_type_ir/src/relate.rs

+    b_arg: I::GenericArgs,
+) -> RelateResult<I, I::GenericArgs>
+where
+    I::GenericArg: Relate<Infcx>,


trait Sup { type Assoc; } trait Trait: Sup<Assoc: Copy> {} fn foo<T: Trait>(x: T::Assoc) -> (T::Assoc, T::Assoc) { (x, x) }

tbh I am actually surpised that that works, don't fully understand why it does

Can add

trait Interner { type GenericArg; } // To allow an impl in `rustc_infer` while still having super traits trait InternerForInfcx<Infcx: ?Sized>: Interner<GenericArg: Relate<Infcx>> {} trait InferCtxtLike { type Interner: InternerForInfcx<Self>; } fn foo<Infcx: InferCtxtLike<Interner = I>, I: InternerForInfcx<Infcx>>() {}

:3

edit: this will make rustc a ParamEnv stress test however, because now every function with an InternerForInfcx<Infcx> bound will have a lot of caller_bounds

bors · 2024-06-01T22:06:46Z

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

rustbot · 2024-06-03T18:38:13Z

Some changes occurred to the core trait solver

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

compiler-errors · 2024-06-04T00:25:59Z

I think this is basically ready for another round of review

@rustbot ready

lcnr

r=me after nits

compiler/rustc_middle/src/ty/error.rs

compiler/rustc_type_ir/src/ty_kind.rs

bors · 2024-06-04T17:10:08Z

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

lcnr · 2024-06-05T07:58:00Z

going to wait on #125958 with this (if we're able to merge that today)

compiler-errors · 2024-06-05T12:57:47Z

Yeah I already locally rebased it onto that PR expecting it would land first, will push the rebased one when it's done.

bors · 2024-06-06T06:45:40Z

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

compiler-errors · 2024-06-06T12:25:42Z

@bors r=lcnr

bors · 2024-06-06T12:25:45Z

📌 Commit 91274c8 has been approved by lcnr

It is now in the queue for this repository.

Uplift `Relate`/`TypeRelation` into `rustc_next_trait_solver` For use in the new solver. This doesn't yet uplift `ObligationEmittingRelation`. r? lcnr

…kingjubilee Rollup of 8 pull requests Successful merges: - rust-lang#125606 (Size optimize int formatting) - rust-lang#125724 (Uplift `Relate`/`TypeRelation` into `rustc_next_trait_solver`) - rust-lang#126040 (Don't warn on fields in the `unreachable_pub` lint ) - rust-lang#126065 (mark binding undetermined if target name exist and not obtained) - rust-lang#126098 (Remove `same-lib-two-locations-no-panic` run-make test) - rust-lang#126099 (Crate loader cleanups) - rust-lang#126101 (Revert "Disallow ambiguous attributes on expressions" on nightly) - rust-lang#126103 (Improve Docs for `hir::Impl` and `hir::ImplItem`) r? `@ghost` `@rustbot` modify labels: rollup

…kingjubilee Rollup of 7 pull requests Successful merges: - rust-lang#125606 (Size optimize int formatting) - rust-lang#125724 (Uplift `Relate`/`TypeRelation` into `rustc_next_trait_solver`) - rust-lang#126040 (Don't warn on fields in the `unreachable_pub` lint ) - rust-lang#126098 (Remove `same-lib-two-locations-no-panic` run-make test) - rust-lang#126099 (Crate loader cleanups) - rust-lang#126101 (Revert "Disallow ambiguous attributes on expressions" on nightly) - rust-lang#126103 (Improve Docs for `hir::Impl` and `hir::ImplItem`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#125724 - compiler-errors:uplift-relate, r=lcnr Uplift `Relate`/`TypeRelation` into `rustc_next_trait_solver` For use in the new solver. This doesn't yet uplift `ObligationEmittingRelation`. r? lcnr

rustbot assigned lcnr May 29, 2024

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 May 29, 2024

rustbot added the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label May 29, 2024

This comment has been minimized.

Sign in to view

compiler-errors force-pushed the uplift-relate branch from f9b3ff1 to e293ba0 Compare May 29, 2024 15:33

This comment has been minimized.

Sign in to view

compiler-errors force-pushed the uplift-relate branch from e293ba0 to a084c35 Compare May 29, 2024 15:41

compiler-errors commented May 30, 2024

View reviewed changes

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels May 30, 2024

lcnr reviewed May 30, 2024

View reviewed changes

compiler-errors force-pushed the uplift-relate branch from a084c35 to 05abaed Compare May 31, 2024 16:18

compiler-errors force-pushed the uplift-relate branch from 05abaed to 99999b3 Compare June 3, 2024 18:38

rustbot 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 Jun 4, 2024

lcnr reviewed Jun 4, 2024

View reviewed changes

compiler/rustc_middle/src/ty/error.rs Outdated Show resolved Hide resolved

compiler/rustc_type_ir/src/ty_kind.rs Outdated Show resolved Hide resolved

compiler-errors force-pushed the uplift-relate branch from 99999b3 to e99efa6 Compare June 4, 2024 19:41

Make middle not rely on next_trait_solver

c74efbc

compiler-errors added 2 commits June 6, 2024 07:49

Uplift TypeError

82ef3ad

Uplift TypeRelation and Relate

91274c8

compiler-errors force-pushed the uplift-relate branch from e99efa6 to 91274c8 Compare June 6, 2024 11:52

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 Jun 6, 2024

workingjubilee mentioned this pull request Jun 7, 2024

Rollup of 8 pull requests #126107

Closed

workingjubilee mentioned this pull request Jun 7, 2024

Rollup of 7 pull requests #126108

Merged

bors merged commit 75aa9d1 into rust-lang:master Jun 7, 2024

rustbot added this to the 1.80.0 milestone Jun 7, 2024

	ProjectionMismatched(ExpectedFound<I::DefId>),
	ProjectionMismatch(ExpectedFound<I::DefId>),

		/// Returns a static string we can use for printouts.
		fn tag(&self) -> &'static str;

Uplift Relate/TypeRelation into rustc_next_trait_solver #125724

Uplift Relate/TypeRelation into rustc_next_trait_solver #125724

Uh oh!

Conversation

compiler-errors commented May 29, 2024

Uh oh!

rustbot commented May 29, 2024

Uh oh!

compiler-errors commented May 29, 2024 • 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.

compiler-errors May 30, 2024

Choose a reason for hiding this comment

Uh oh!

lcnr May 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented May 30, 2024

Uh oh!

bors commented May 30, 2024

Uh oh!

lcnr left a comment

Choose a reason for hiding this comment

Uh oh!

lcnr May 30, 2024

Choose a reason for hiding this comment

Uh oh!

lcnr May 30, 2024

Choose a reason for hiding this comment

Uh oh!

lcnr May 30, 2024

Choose a reason for hiding this comment

Uh oh!

lcnr May 30, 2024

Choose a reason for hiding this comment

Uh oh!

lcnr May 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bors commented Jun 1, 2024

Uh oh!

rustbot commented Jun 3, 2024

Uh oh!

compiler-errors commented Jun 4, 2024

Uh oh!

lcnr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bors commented Jun 4, 2024

Uh oh!

lcnr commented Jun 5, 2024

Uh oh!

compiler-errors commented Jun 5, 2024

Uh oh!

bors commented Jun 6, 2024

Uh oh!

compiler-errors commented Jun 6, 2024

Uh oh!

bors commented Jun 6, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uplift `Relate`/`TypeRelation` into `rustc_next_trait_solver` #125724

Uplift `Relate`/`TypeRelation` into `rustc_next_trait_solver` #125724

compiler-errors commented May 29, 2024 •

edited

Loading

lcnr May 30, 2024 •

edited

Loading

lcnr May 30, 2024 •

edited

Loading