Destribute placeholders

Author: WaffleLapkin

compiler/rustc_middle/src/ty/consts.rs

@@ -1,12 +1,14 @@
-use crate::middle::resolve_bound_vars as rbv;
-use crate::mir::interpret::LitToConstInput;
-use crate::ty::{self, InternalSubsts, ParamEnv, ParamEnvAnd, Ty, TyCtxt};
+use std::fmt;
+
 use rustc_data_structures::intern::Interned;
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::LocalDefId;
 use rustc_macros::HashStable;
-use std::fmt;
+
+use crate::middle::resolve_bound_vars as rbv;
+use crate::mir::interpret::LitToConstInput;
+use crate::ty::{self, BoundVar, InternalSubsts, ParamEnv, ParamEnvAnd, Placeholder, Ty, TyCtxt};
 
 mod int;
 mod kind;
@@ -37,6 +39,8 @@ pub struct ConstData<'tcx> {
     pub kind: ConstKind<'tcx>,
 }
 
+pub type PlaceholderConst<'tcx> = Placeholder<BoundVar>;
+
 #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
 static_assert_size!(ConstData<'_>, 40);
 

compiler/rustc_middle/src/ty/mod.rs

@@ -80,6 +80,7 @@ mod param_env;
 mod parameterized;
 mod placeholder;
 mod predicate;
+mod region;
 mod rvalue_scopes;
 mod structural_impls;
 mod sty;
@@ -118,8 +119,8 @@ pub use self::coherence::{
     CrateInherentImpls, ImplHeader, ImplOverlapKind, ImplPolarity, ImplSubject,
 };
 pub use self::consts::{
-    BoundConst, Const, ConstData, ConstInt, ConstKind, Expr, InferConst, ScalarInt,
-    UnevaluatedConst, ValTree,
+    BoundConst, Const, ConstData, ConstInt, ConstKind, Expr, InferConst, PlaceholderConst,
+    ScalarInt, UnevaluatedConst, ValTree,
 };
 pub use self::context::{
     tls, CtxtInterners, DeducedParamAttrs, FreeRegionInfo, GlobalCtxt, Lift, TyCtxt, TyCtxtFeed,
@@ -137,14 +138,15 @@ pub use self::list::List;
 pub use self::opaque::{OpaqueHiddenType, OpaqueTypeKey};
 pub use self::param_env::{ParamEnv, ParamEnvAnd};
 pub use self::parameterized::ParameterizedOverTcx;
-pub use self::placeholder::{Placeholder, PlaceholderConst, PlaceholderRegion, PlaceholderType};
+pub use self::placeholder::Placeholder;
 pub use self::predicate::{
     BoundConstness, Clause, CoercePredicate, CratePredicatesMap, InstantiatedPredicates,
     OutlivesPredicate, PolyCoercePredicate, PolyProjectionPredicate, PolyRegionOutlivesPredicate,
     PolySubtypePredicate, PolyTraitPredicate, PolyTypeOutlivesPredicate, Predicate, PredicateKind,
     ProjectionPredicate, RegionOutlivesPredicate, SubtypePredicate, ToPredicate, TraitPredicate,
     TypeOutlivesPredicate,
 };
+pub use self::region::PlaceholderRegion;
 pub use self::rvalue_scopes::RvalueScopes;
 pub use self::sty::BoundRegionKind::*;
 pub use self::sty::{
@@ -160,7 +162,7 @@ pub use self::subst::*;
 pub use self::symbol_name::SymbolName;
 pub use self::term::{ParamTerm, Term, TermKind};
 pub use self::trait_def::TraitDef;
-pub use self::ty_::Ty;
+pub use self::ty_::{PlaceholderType, Ty};
 pub use self::typeck_results::{
     CanonicalUserType, CanonicalUserTypeAnnotation, CanonicalUserTypeAnnotations,
     GeneratorDiagnosticData, GeneratorInteriorTypeCause, TypeckResults, UserType,

compiler/rustc_middle/src/ty/placeholder.rs

@@ -1,10 +1,4 @@
-use crate::ty::{BoundRegion, BoundTy, BoundVar, UniverseIndex};
-
-pub type PlaceholderRegion = Placeholder<BoundRegion>;
-
-pub type PlaceholderType = Placeholder<BoundTy>;
-
-pub type PlaceholderConst<'tcx> = Placeholder<BoundVar>;
+use crate::ty::UniverseIndex;
 
 /// The "placeholder index" fully defines a placeholder region, type, or const. Placeholders are
 /// identified by both a universe, as well as a name residing within that universe. Distinct bound

compiler/rustc_middle/src/ty/region.rs

@@ -0,0 +1,3 @@
+use crate::ty::{BoundRegion, Placeholder};
+
+pub type PlaceholderRegion = Placeholder<BoundRegion>;

compiler/rustc_middle/src/ty/ty_.rs

@@ -1,9 +1,11 @@
-use crate::ty::{Interned, TyKind, WithCachedTypeInfo};
+use crate::ty::{BoundTy, Interned, Placeholder, TyKind, WithCachedTypeInfo};
 
 /// Use this rather than `TyKind`, whenever possible.
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, HashStable)]
 #[rustc_diagnostic_item = "Ty"]
 #[rustc_pass_by_value]
 pub struct Ty<'tcx>(pub(super) Interned<'tcx, WithCachedTypeInfo<TyKind<'tcx>>>);
 
+pub type PlaceholderType = Placeholder<BoundTy>;
+
 // FIXME: move `Ty` inherent impls here (and possibly change structure wrt `sty` mod)