fix I::Interned<...> type error

Author: Jamesbarford

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

@@ -12,7 +12,9 @@ use rustc_hir::def_id::{DefId, LocalDefId};
 use rustc_hir::lang_items::LangItem;
 use rustc_span::{DUMMY_SP, Span, Symbol};
 use rustc_type_ir::lang_items::{SolverAdtLangItem, SolverLangItem, SolverTraitLangItem};
-use rustc_type_ir::{CollectAndApply, Interner, TypeFoldable, elaborate, search_graph};
+use rustc_type_ir::{
+    CollectAndApply, Interner, TypeFoldable, WithCachedTypeInfo, elaborate, search_graph,
+};
 
 use crate::dep_graph::{DepKind, DepNodeIndex};
 use crate::infer::canonical::CanonicalVarKinds;
@@ -48,8 +50,7 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
     type ImplId = DefId;
     type UnevaluatedConstId = DefId;
     type Span = Span;
-    type Interned<T: Copy + Clone + std::fmt::Debug + std::hash::Hash + Eq + PartialEq> =
-        Interned<'tcx, T>;
+    type InternedTyKindWithCachedInfo = Interned<'tcx, WithCachedTypeInfo<ty::TyKind<'tcx>>>;
     type VariantIdx = VariantIdx;
     type Discr = Discr<'tcx>;
     type ObligationCause = ObligationCause<'tcx>;

compiler/rustc_type_ir/src/interner.rs

@@ -14,7 +14,9 @@ use crate::lang_items::{SolverAdtLangItem, SolverLangItem, SolverTraitLangItem};
 use crate::relate::Relate;
 use crate::solve::{CanonicalInput, Certainty, ExternalConstraintsData, QueryResult, inspect};
 use crate::visit::{Flags, TypeVisitable};
-use crate::{self as ty, CanonicalParamEnvCacheEntry, Ty, search_graph};
+use crate::{
+    self as ty, CanonicalParamEnvCacheEntry, Ty, TyKind, WithCachedTypeInfo, search_graph,
+};
 
 #[cfg_attr(feature = "nightly", rustc_diagnostic_item = "type_ir_interner")]
 pub trait Interner:
@@ -177,13 +179,20 @@ pub trait Interner:
     type Clause: Clause<Self>;
     type Clauses: Clauses<Self>;
 
-    type Interned<T: Copy + Clone + Debug + Hash + Eq + PartialEq>: Copy
+    // type Interned<'a, T: Copy + Clone + Debug + Hash + Eq + PartialEq + 'a>: Copy
+    //     + Clone
+    //     + Debug
+    //     + Hash
+    //     + Eq
+    //     + PartialEq
+    //     + Deref<Target = T>;
+    type InternedTyKindWithCachedInfo: Copy
         + Clone
         + Debug
         + Hash
         + Eq
         + PartialEq
-        + Deref<Target = T>;
+        + Deref<Target = WithCachedTypeInfo<TyKind<Self>>>;
     type VariantIdx;
     type Discr: Debug + Copy + Clone;
     type ObligationCause: Debug + Clone;

compiler/rustc_type_ir/src/sty/mod.rs

@@ -25,20 +25,20 @@ use crate::{
 };
 
 /// Use this rather than `TyKind`, whenever possible.
-#[derive_where(Copy; I: Interner, I::Interned<WithCachedTypeInfo<TyKind<I>>>: Copy)]
+#[derive_where(Copy; I: Interner, I::InternedTyKindWithCachedInfo: Copy)]
 #[derive_where(Clone, PartialEq, Eq, Hash; I: Interner)]
 #[rustc_diagnostic_item = "Ty"]
 #[rustc_pass_by_value]
-pub struct Ty<I: Interner>(pub I::Interned<WithCachedTypeInfo<TyKind<I>>>);
+pub struct Ty<I: Interner>(pub I::InternedTyKindWithCachedInfo);
 
 impl<I: Interner> Ty<I> {
     #[inline]
-    pub fn from_interned(interned: I::Interned<WithCachedTypeInfo<TyKind<I>>>) -> Self {
+    pub fn from_interned(interned: I::InternedTyKindWithCachedInfo) -> Self {
         Ty(interned)
     }
 
     #[inline]
-    pub fn interned(self) -> I::Interned<WithCachedTypeInfo<TyKind<I>>> {
+    pub fn interned(self) -> I::InternedTyKindWithCachedInfo {
         self.0
     }
 }
@@ -60,7 +60,7 @@ impl<CTX, I: Interner> HashStable<CTX> for Ty<I> {
 
 impl<I: Interner> fmt::Debug for Ty<I>
 where
-    I::Interned<WithCachedTypeInfo<TyKind<I>>>: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
+    I::InternedTyKindWithCachedInfo: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Debug::fmt(&(*self).kind(), f)
@@ -69,7 +69,7 @@ where
 
 impl<I: Interner> IntoKind for Ty<I>
 where
-    I::Interned<WithCachedTypeInfo<TyKind<I>>>: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
+    I::InternedTyKindWithCachedInfo: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
 {
     type Kind = TyKind<I>;
 
@@ -81,7 +81,7 @@ where
 
 impl<I: Interner> Flags for Ty<I>
 where
-    I::Interned<WithCachedTypeInfo<TyKind<I>>>: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
+    I::InternedTyKindWithCachedInfo: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
 {
     #[inline]
     fn flags(&self) -> TypeFlags {
@@ -102,7 +102,7 @@ impl<I: Interner> TypeVisitable<I> for Ty<I> {
 
 impl<I: Interner> TypeSuperVisitable<I> for Ty<I>
 where
-    I::Interned<WithCachedTypeInfo<TyKind<I>>>: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
+    I::InternedTyKindWithCachedInfo: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
     I::BoundExistentialPredicates: TypeVisitable<I>,
     I::Const: TypeVisitable<I>,
     I::ErrorGuaranteed: TypeVisitable<I>,
@@ -171,7 +171,7 @@ impl<I: Interner> TypeFoldable<I> for Ty<I> {
 
 impl<I: Interner> TypeSuperFoldable<I> for Ty<I>
 where
-    I::Interned<WithCachedTypeInfo<TyKind<I>>>: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
+    I::InternedTyKindWithCachedInfo: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
     I::BoundExistentialPredicates: TypeFoldable<I>,
     I::Const: TypeFoldable<I>,
     I::GenericArgs: TypeFoldable<I>,
@@ -279,7 +279,7 @@ where
     I::Region: TypeFoldable<I> + TypeVisitable<I>,
     I::Term: From<Ty<I>>,
     I::Tys: TypeFoldable<I> + TypeVisitable<I>,
-    I::Interned<WithCachedTypeInfo<TyKind<I>>>:
+    I::InternedTyKindWithCachedInfo:
         Copy + Clone + Debug + Hash + Eq + Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
 {
     /// Avoid using this in favour of more specific `new_*` methods, where possible.
@@ -652,7 +652,7 @@ where
 // Methods to determine what flavour `Ty` is
 impl<I: Interner> Ty<I>
 where
-    I::Interned<WithCachedTypeInfo<TyKind<I>>>: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
+    I::InternedTyKindWithCachedInfo: Deref<Target = WithCachedTypeInfo<TyKind<I>>>,
     I::BoundExistentialPredicates: TypeVisitable<I>,
     I::Const: TypeVisitable<I>,
     I::ErrorGuaranteed: TypeVisitable<I>,