a

Author: BoxyUwU

compiler/rustc_middle/src/ty/error.rs

@@ -209,7 +209,7 @@ impl<'tcx> Ty<'tcx> {
             ty::Placeholder(..) => "higher-ranked type".into(),
             ty::Bound(..) => "bound type variable".into(),
             ty::Alias(ty::Projection | ty::Inherent, _) => "associated type".into(),
-            ty::Alias(ty::Free, _) => "type alias".into(),
+            ty::Alias(ty::Unresolved | ty::Free, _) => "type alias".into(),
             ty::Param(_) => "type parameter".into(),
             ty::Alias(ty::Opaque, ..) => "opaque type".into(),
         }

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

@@ -800,7 +800,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
                 }
             }
             ty::Foreign(def_id) => self.print_def_path(def_id, &[])?,
-            ty::Alias(ty::Projection | ty::Inherent | ty::Free, ref data) => data.print(self)?,
+            ty::Alias(ty::Unresolved | ty::Projection | ty::Inherent | ty::Free, ref data) => data.print(self)?,
             ty::Placeholder(placeholder) => placeholder.print(self)?,
             ty::Alias(ty::Opaque, ty::AliasTy { def_id, args, .. }) => {
                 // We use verbose printing in 'NO_QUERIES' mode, to
@@ -3121,6 +3121,9 @@ define_print! {
                     p.print_def_path(self.def_id, self.args)?;
                 }
             }
+            // FIXME(thispr): lol
+            ty::AliasTermKind::UnresolvedTy
+            | ty::AliasTermKind::UnresolvedConst => todo!(),
             ty::AliasTermKind::FreeTy
             | ty::AliasTermKind::FreeConst
             | ty::AliasTermKind::OpaqueTy

compiler/rustc_middle/src/ty/util.rs

@@ -935,6 +935,8 @@ impl<'tcx> TyCtxt<'tcx> {
             ty::AliasTermKind::OpaqueTy => Some(self.variances_of(def_id)),
             ty::AliasTermKind::InherentTy
             | ty::AliasTermKind::InherentConst
+            | ty::AliasTermKind::UnresolvedTy
+            | ty::AliasTermKind::UnresolvedConst
             | ty::AliasTermKind::FreeTy
             | ty::AliasTermKind::FreeConst
             | ty::AliasTermKind::UnevaluatedConst

compiler/rustc_next_trait_solver/src/solve/assembly/mod.rs

@@ -703,7 +703,7 @@ where
             }
 
             ty::Alias(kind @ (ty::Projection | ty::Opaque), alias_ty) => (kind, alias_ty),
-            ty::Alias(ty::Inherent | ty::Free, _) => {
+            ty::Alias(ty::Unresolved | ty::Inherent | ty::Free, _) => {
                 self.cx().delay_bug(format!("could not normalize {self_ty:?}, it is not WF"));
                 return;
             }

compiler/rustc_next_trait_solver/src/solve/assembly/structural_traits.rs

@@ -49,7 +49,7 @@ where
 
         ty::Dynamic(..)
         | ty::Param(..)
-        | ty::Alias(ty::Projection | ty::Inherent | ty::Free, ..)
+        | ty::Alias(ty::Unresolved | ty::Projection | ty::Inherent | ty::Free, ..)
         | ty::Placeholder(..)
         | ty::Bound(..)
         | ty::Infer(_) => {

compiler/rustc_next_trait_solver/src/solve/normalizes_to/mod.rs

@@ -57,6 +57,8 @@ where
                 self.normalize_free_alias(goal)
             }
             ty::AliasTermKind::UnevaluatedConst => self.normalize_anon_const(goal),
+            // FIXME(thispr)
+            ty::AliasTermKind::UnresolvedTy | ty::AliasTermKind::UnresolvedConst => todo!(),
         }
     }
 
@@ -156,6 +158,9 @@ where
                 }
             }
             ty::AliasTermKind::OpaqueTy
+            // FIXME(thispr): are we only handling rigid aliases here?
+            | ty::AliasTermKind::UnresolvedTy
+            | ty::AliasTermKind::UnresolvedConst
             | ty::AliasTermKind::InherentTy
             | ty::AliasTermKind::InherentConst
             | ty::AliasTermKind::FreeTy

compiler/rustc_public/src/unstable/convert/stable/ty.rs

@@ -17,6 +17,8 @@ impl<'tcx> Stable<'tcx> for ty::AliasTyKind {
     fn stable(&self, _: &mut Tables<'_, BridgeTys>, _: &CompilerCtxt<'_, BridgeTys>) -> Self::T {
         match self {
             ty::Projection => crate::ty::AliasKind::Projection,
+            // FIXME(thispr):
+            ty::Unresolved => todo!(),
             ty::Inherent => crate::ty::AliasKind::Inherent,
             ty::Opaque => crate::ty::AliasKind::Opaque,
             ty::Free => crate::ty::AliasKind::Free,

compiler/rustc_trait_selection/src/error_reporting/infer/region.rs

@@ -719,7 +719,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
                 ty::Projection | ty::Inherent => {
                     format!("the associated type `{bound_kind}`")
                 }
-                ty::Free => format!("the type alias `{bound_kind}`"),
+                ty::Unresolved | ty::Free => format!("the type alias `{bound_kind}`"),
                 ty::Opaque => format!("the opaque type `{bound_kind}`"),
             },
         };

compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

@@ -1722,6 +1722,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
                 ty::CoroutineClosure(..) => Some(21),
                 ty::Pat(..) => Some(22),
                 ty::UnsafeBinder(..) => Some(23),
+                ty::Alias(ty::Unresolved, ..) => Some(24),
                 ty::Placeholder(..) | ty::Bound(..) | ty::Infer(..) | ty::Error(_) => None,
             }
         }

compiler/rustc_type_ir/src/flags.rs

@@ -279,6 +279,8 @@ impl<I: Interner> FlagComputation<I> {
 
             ty::Alias(kind, data) => {
                 self.add_flags(match kind {
+                    // FIXME(thispr): Add TypeFlags::HAS_TY_UNRESOLVED?
+                    ty::Unresolved => todo!(),
                     ty::Projection => TypeFlags::HAS_TY_PROJECTION,
                     ty::Free => TypeFlags::HAS_TY_FREE_ALIAS,
                     ty::Opaque => TypeFlags::HAS_TY_OPAQUE,