Move AliasTy and AliasTerm types to ty/alias.rs

Author: Jamesbarford

compiler/rustc_type_ir/src/lib.rs

@@ -81,7 +81,7 @@ pub use predicate_kind::*;
 pub use region_kind::*;
 pub use rustc_ast_ir::{FloatTy, IntTy, Movability, Mutability, Pinnedness, UintTy};
 use rustc_type_ir_macros::GenericTypeVisitable;
-pub use ty::Alias;
+pub use ty::{Alias, AliasTerm, AliasTy};
 pub use ty_info::*;
 pub use ty_kind::*;
 pub use unnormalized::Unnormalized;

compiler/rustc_type_ir/src/predicate.rs

@@ -10,6 +10,7 @@ use rustc_type_ir_macros::{
 
 use crate::fold::{FallibleTypeFolder, TypeFoldable, TypeFolder};
 use crate::inherent::*;
+use crate::ty::AliasTerm;
 use crate::upcast::{Upcast, UpcastFrom};
 use crate::visit::{TypeVisitable, TypeVisitableExt as _, TypeVisitor};
 use crate::{self as ty, Alias, AliasTyKind, Interner, UnevaluatedConstKind, try_visit};
@@ -662,8 +663,6 @@ impl<I: Interner> From<ty::UnevaluatedConstKind<I>> for AliasTermKind<I> {
     }
 }
 
-pub type AliasTerm<I> = Alias<I, AliasTermKind<I>>;
-
 impl<I: Interner> AliasTerm<I> {
     pub fn new_from_args(
         interner: I,
@@ -722,6 +721,7 @@ impl<I: Interner> AliasTerm<I> {
         ty::UnevaluatedConst { kind, args: self.args, _use_unevaluated_const_new_instead: () }
     }
 
+    // FIXME: replace with explicit matches
     pub fn def_id(self) -> I::DefId {
         self.kind.def_id()
     }

compiler/rustc_type_ir/src/ty/alias.rs

@@ -6,6 +6,8 @@ use rustc_type_ir_macros::{
 };
 
 use crate::Interner;
+use crate::predicate::AliasTermKind;
+use crate::ty_kind::AliasTyKind;
 
 /// Represents an alias of a type, constant, or other term-like item.
 ///
@@ -59,3 +61,6 @@ impl<I: Interner> Alias<I, I::UnevaluatedConstId> {
         Alias { kind, args, _use_alias_new_instead: () }
     }
 }
+
+pub type AliasTerm<I> = Alias<I, AliasTermKind<I>>;
+pub type AliasTy<I> = Alias<I, AliasTyKind<I>>;

compiler/rustc_type_ir/src/ty/mod.rs

@@ -1,3 +1,3 @@
 mod alias;
 
-pub use alias::Alias;
+pub use alias::{Alias, AliasTerm, AliasTy};

compiler/rustc_type_ir/src/ty_kind.rs

@@ -17,7 +17,7 @@ use rustc_type_ir_macros::{
 use self::TyKind::*;
 pub use self::closure::*;
 use crate::inherent::*;
-use crate::ty::Alias;
+use crate::ty::AliasTy;
 #[cfg(feature = "nightly")]
 use crate::visit::TypeVisitable;
 use crate::{self as ty, BoundVarIndexKind, FloatTy, IntTy, Interner, UintTy};
@@ -432,8 +432,6 @@ impl<I: Interner> fmt::Debug for TyKind<I> {
     }
 }
 
-pub type AliasTy<I> = Alias<I, AliasTyKind<I>>;
-
 impl<I: Interner> AliasTy<I> {
     pub fn new_from_args(interner: I, kind: AliasTyKind<I>, args: I::GenericArgs) -> AliasTy<I> {
         interner.debug_assert_args_compatible(kind.def_id(), args);