Chore/move more types to ir by Jamesbarford · Pull Request #152706 · rust-lang/rust

Jamesbarford · 2026-02-16T11:23:32Z

r? ghost

compiler/rustc_middle/src/ty/print/pretty.rs

lcnr · 2026-02-16T18:36:19Z

compiler/rustc_middle/src/ty/codec.rs

-    where
-        F: FnOnce(&mut Self) -> R;
+pub trait TyEncoder<'tcx>: ir_codec::TyEncoder<'tcx, Interner = TyCtxt<'tcx>> {}
+impl<'tcx, T> TyEncoder<'tcx> for T where T: ir_codec::TyEncoder<'tcx, Interner = TyCtxt<'tcx>> {}


why does this trait have to be moved? This is surprising to me

Might be good to write in the PR description what you're moving and why.

As in, sth like

moving Ty

also uses other types X which now need to be moved

has function which relies on tcx, add method fn XXX to trait Interner

compiler/rustc_middle/src/ty/codec.rs

lcnr · 2026-02-16T18:38:50Z

compiler/rustc_type_ir/src/binder.rs

-    feature = "nightly",
-    derive(Encodable_NoContext, Decodable_NoContext, HashStable_NoContext)
-)]
+#[cfg_attr(feature = "nightly", derive(HashStable_NoContext))]


lcnr · 2026-02-16T18:39:16Z

compiler/rustc_type_ir/src/binder.rs

+#[rustc_diagnostic_item = "Ty"]
+#[rustc_pass_by_value]
+#[rustc_has_incoherent_inherent_impls]
+pub struct Ty<I: Interner>(pub I::Interned<WithCachedTypeInfo<TyKind<I>>>);


should be in a mod ty or mod sty to mirror rustc_middle

compiler/rustc_type_ir/src/binder.rs

lcnr · 2026-02-16T18:41:22Z

compiler/rustc_type_ir/src/binder.rs

+
+impl<I: Interner> TypeSuperVisitable<I> for Ty<I>
+where
+    I::Interned<WithCachedTypeInfo<TyKind<I>>>: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,


should be item bound of I::Interned, same with all other where-bounds here

lcnr · 2026-02-16T18:41:44Z

compiler/rustc_type_ir/src/binder.rs

+    I::Region: TypeFoldable<I> + TypeVisitable<I>,
+    I::Term: From<Ty<I>>,
+    I::Tys: TypeFoldable<I> + TypeVisitable<I>,
+    I::Interned<WithCachedTypeInfo<TyKind<I>>>:


all item bounds of Interned

lcnr · 2026-02-16T18:42:53Z

compiler/rustc_type_ir/src/codec.rs

+/// This offset is also chosen so that the first byte is never < 0x80.
+pub const SHORTHAND_OFFSET: usize = 0x80;
+
+pub trait TyEncoder<'tcx>: SpanEncoder {


this feels rustc specific and is not used by r-a afaik, so I'd prefer keeping this in rustc_middle for now

I've moved this back as I don't know how to make this work without doing so. I get the errors;

error[E0210]: type parameter `E` must be used as the type parameter for some local type (e.g., `MyStruct<E>`) --> compiler/rustc_middle/src/ty/codec.rs:142:12 | 142 | impl<'tcx, E: TyEncoder<'tcx>> Encodable<E> for Ty<'tcx> { | ^ type parameter `E` must be used as the type parameter for some local type | = note: implementing a foreign trait is only possible if at least one of the types for which it is implemented is local = note: only traits defined in the current crate can be implemented for a type parameter error[E0210]: type parameter `D` must be used as the type parameter for some local type (e.g., `MyStruct<D>`) --> compiler/rustc_middle/src/ty/codec.rs:234:12 | 234 | impl<'tcx, D: TyDecoder<'tcx>> Decodable<D> for Ty<'tcx> { | ^ type parameter `D` must be used as the type parameter for some local type | = note: implementing a foreign trait is only possible if at least one of the types for which it is implemented is local = note: only traits defined in the current crate can be implemented for a type parameter

The simplest thing I could think of to make the error go away was to move it

lcnr · 2026-02-16T18:44:54Z

compiler/rustc_type_ir/src/inherent.rs

 }
+
+pub trait Interned<T>: Clone + Copy + Hash + PartialEq + Eq + Debug {
+    fn new_unchecked(t: &T) -> Self;


🤔 where is that used, surprising that we'd ever want to use this in rustc_next_trait_solver

lcnr · 2026-02-16T18:45:18Z

compiler/rustc_type_ir/src/interner.rs

+        + Hash
+        + Eq
+        + PartialEq
+        + Deref<Target = T>;


should be a super trait bounds of a single Interned trait

lcnr · 2026-02-16T18:46:04Z

compiler/rustc_type_ir/src/lib.rs

 #![cfg_attr(feature = "nightly", rustc_diagnostic_item = "type_ir")]
 // tidy-alphabetical-start
 #![allow(rustc::direct_use_of_rustc_type_ir)]
+#![allow(rustc::pass_by_value)]


please don't

lcnr

changes to rustc_next_trait_solver look as expected

don't need to change rust-analyzer for now as they don't directly depend on rustc. We need ot change it to test that it's correct, but I'd wait on actually getting rustc to work for this

View changes since this review

compiler/rustc_metadata/src/rmeta/decoder.rs

lcnr · 2026-03-02T08:00:06Z

compiler/rustc_middle/src/ty/context/impl_interner.rs

+        def_id: DefId,
+        args: Self::GenericArgs,
+    ) -> Ty<'tcx> {
+        Ty::new_coroutine_witness_for_coroutine(self, def_id, args)


why method on Interner insetead of Ty?

lcnr · 2026-03-02T08:00:22Z

compiler/rustc_middle/src/ty/context/impl_interner.rs

+    }
+
+    fn ty_discriminant_ty(self, ty: Ty<'tcx>) -> Ty<'tcx> {
+        ty.discriminant_ty(self)


lcnr · 2026-03-02T08:02:06Z

compiler/rustc_middle/src/ty/context/impl_interner.rs

+    fn u8_type(self) -> Ty<'tcx> {
+        self.types.u8
+    }


can you, potentially in an earlier PR so that we can test it for perf, stop using self.types.X and instead use Ty::new_uint(..). This should inline to the same thing and means whether we have a precomputed interned type for u8 is not handled by the interner

lcnr · 2026-03-02T08:02:51Z

compiler/rustc_middle/src/ty/print/pretty.rs

 use rustc_macros::{Lift, extension};
 use rustc_session::cstore::{ExternCrate, ExternCrateSource};
 use rustc_span::{Ident, RemapPathScopeComponents, Symbol, kw, sym};
+use rustc_type_ir::inherent::{GenericArgs as _, IntoKind as _};


why? we should never import these traits 🤔

I believe it is due to have implemented IntoKind on Ty to expose the kind() method but then not made a pub fn kind(&self) pass-through method that previously existed. I would think once I've implemented the pass-through I can remove this. As for GenericArgs, it could possibly a similar reason

I would expect that with Ty you now have an inherent fn kind method 🤔

lcnr · 2026-03-02T08:03:52Z

compiler/rustc_middle/src/ty/print/pretty.rs

                            tcx,
                            trait_def_id,
-                            [self_ty, Ty::new_tup(tcx, args)],
+                            [self_ty, ty::Ty::new_tup(tcx, args)],


this should lint 🤔 as we want people to consistently use Ty and import it from rustc_middle::ty. We should have some #[cfg_if("nightly", rustc_diagnostic_item = "Ty")] attribute on Ty

compiler/rustc_middle/src/ty/print/pretty.rs

compiler/rustc_type_ir/src/interner.rs

Jamesbarford force-pushed the chore/move-more-types-to-ir branch from 3ef4cf0 to c64839d Compare February 16, 2026 12:35

This comment has been minimized.

Sign in to view

lcnr self-assigned this Feb 16, 2026

lcnr reviewed Feb 16, 2026

View reviewed changes

compiler/rustc_middle/src/ty/print/pretty.rs Outdated Show resolved Hide resolved

lcnr reviewed Feb 16, 2026

View reviewed changes

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

lcnr reviewed Feb 16, 2026

View reviewed changes

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

lcnr reviewed Feb 16, 2026

View reviewed changes

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

lcnr reviewed Feb 16, 2026

View reviewed changes

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

lcnr reviewed Feb 16, 2026

View reviewed changes

Jamesbarford force-pushed the chore/move-more-types-to-ir branch from c64839d to 9b563d7 Compare February 26, 2026 09:28

This comment has been minimized.

Sign in to view

lcnr reviewed Mar 2, 2026

View reviewed changes

rustbot added the A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. label Mar 2, 2026

Jamesbarford force-pushed the chore/move-more-types-to-ir branch from 4bb23fa to f89feb9 Compare March 2, 2026 16:24

This comment has been minimized.

Sign in to view

Jamesbarford force-pushed the chore/move-more-types-to-ir branch from f89feb9 to 0780eb0 Compare March 3, 2026 10:13

This comment has been minimized.

Sign in to view

Jamesbarford force-pushed the chore/move-more-types-to-ir branch from 207dc41 to bc41000 Compare March 3, 2026 10:54

This comment has been minimized.

Sign in to view

Jamesbarford force-pushed the chore/move-more-types-to-ir branch 2 times, most recently from cf831bc to 6b77eb6 Compare March 5, 2026 10:30

This comment has been minimized.

Sign in to view

Jamesbarford force-pushed the chore/move-more-types-to-ir branch from 6b77eb6 to 6e68fcc Compare March 9, 2026 15:59

This comment has been minimized.

Sign in to view

Jamesbarford force-pushed the chore/move-more-types-to-ir branch from 6e68fcc to 27ceba3 Compare March 10, 2026 08:24

This comment has been minimized.

Sign in to view

Jamesbarford force-pushed the chore/move-more-types-to-ir branch 2 times, most recently from 4462ec4 to 80bdb0c Compare March 10, 2026 12:20

This comment has been minimized.

Sign in to view

Jamesbarford force-pushed the chore/move-more-types-to-ir branch from 80bdb0c to f13f2dd Compare March 11, 2026 07:53

This comment has been minimized.

Sign in to view

Jamesbarford force-pushed the chore/move-more-types-to-ir branch 2 times, most recently from 8805200 to a000014 Compare March 11, 2026 08:44

This comment has been minimized.

Sign in to view

Move Ty<...> from rustc_middle to rustc_type_ir

edbe82c

Jamesbarford force-pushed the chore/move-more-types-to-ir branch from a000014 to 28d7f8f Compare March 11, 2026 10:32

Jamesbarford added 2 commits March 11, 2026 14:16

move encoder/decoder impls to rustc_type_ir

f589389

fix for QueryKey

8b6b679

Jamesbarford force-pushed the chore/move-more-types-to-ir branch from 28d7f8f to 8b6b679 Compare March 11, 2026 14:22

Uh oh!

Conversation

Jamesbarford commented Feb 16, 2026

Uh oh!

This comment has been minimized.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lcnr left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

lcnr left a comment •

edited by rustbot

Loading