Move struct placeholder pt2

compiler/rustc_borrowck/src/diagnostics/bound_region_errors.rs

@@ -52,7 +52,7 @@ impl<'tcx> UniverseInfo<'tcx> {
     pub(crate) fn report_erroneous_element(
         &self,
         mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,
-        placeholder: ty::PlaceholderRegion<'tcx>,
+        placeholder: ty::PlaceholderRegion<TyCtxt<'tcx>>,
         error_element: RegionElement<'tcx>,
         cause: ObligationCause<'tcx>,
     ) {
@@ -152,7 +152,7 @@ pub(crate) trait TypeOpInfo<'tcx> {
     fn report_erroneous_element(
         &self,
         mbcx: &mut MirBorrowckCtxt<'_, '_, 'tcx>,
-        placeholder: ty::PlaceholderRegion<'tcx>,
+        placeholder: ty::PlaceholderRegion<TyCtxt<'tcx>>,
         error_element: RegionElement<'tcx>,
         cause: ObligationCause<'tcx>,
     ) {

compiler/rustc_borrowck/src/diagnostics/region_errors.rs

@@ -111,7 +111,7 @@ pub(crate) enum RegionErrorKind<'tcx> {
         /// The region element that erroneously must be outlived by `longer_fr`.
         error_element: RegionElement<'tcx>,
         /// The placeholder region.
-        placeholder: ty::PlaceholderRegion<'tcx>,
+        placeholder: ty::PlaceholderRegion<TyCtxt<'tcx>>,
     },
 
     /// Any other lifetime error.

compiler/rustc_borrowck/src/region_infer/mod.rs

@@ -481,7 +481,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
     pub(crate) fn placeholders_contained_in(
         &self,
         r: RegionVid,
-    ) -> impl Iterator<Item = ty::PlaceholderRegion<'tcx>> {
+    ) -> impl Iterator<Item = ty::PlaceholderRegion<TyCtxt<'tcx>>> {
         let scc = self.constraint_sccs.scc(r);
         self.scc_values.placeholders_contained_in(scc)
     }
@@ -1311,7 +1311,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
     fn check_bound_universal_region(
         &self,
         longer_fr: RegionVid,
-        placeholder: ty::PlaceholderRegion<'tcx>,
+        placeholder: ty::PlaceholderRegion<TyCtxt<'tcx>>,
         errors_buffer: &mut RegionErrors<'tcx>,
     ) {
         debug!("check_bound_universal_region(fr={:?}, placeholder={:?})", longer_fr, placeholder,);

compiler/rustc_borrowck/src/region_infer/values.rs

@@ -32,7 +32,7 @@ pub(crate) enum RegionElement<'tcx> {
 
     /// A placeholder (e.g., instantiated from a `for<'a> fn(&'a u32)`
     /// type).
-    PlaceholderRegion(ty::PlaceholderRegion<'tcx>),
+    PlaceholderRegion(ty::PlaceholderRegion<TyCtxt<'tcx>>),
 }
 
 /// Records the CFG locations where each region is live. When we initially compute liveness, we use
@@ -197,27 +197,30 @@ impl LivenessValues {
 #[derive(Debug, Default)]
 #[derive(Clone)] // FIXME(#146079)
 pub(crate) struct PlaceholderIndices<'tcx> {
-    indices: FxIndexSet<ty::PlaceholderRegion<'tcx>>,
+    indices: FxIndexSet<ty::PlaceholderRegion<TyCtxt<'tcx>>>,
 }
 
 impl<'tcx> PlaceholderIndices<'tcx> {
     /// Returns the `PlaceholderIndex` for the inserted `PlaceholderRegion`
-    pub(crate) fn insert(&mut self, placeholder: ty::PlaceholderRegion<'tcx>) -> PlaceholderIndex {
+    pub(crate) fn insert(
+        &mut self,
+        placeholder: ty::PlaceholderRegion<TyCtxt<'tcx>>,
+    ) -> PlaceholderIndex {
         let (index, _) = self.indices.insert_full(placeholder);
         index.into()
     }
 
     pub(crate) fn lookup_index(
         &self,
-        placeholder: ty::PlaceholderRegion<'tcx>,
+        placeholder: ty::PlaceholderRegion<TyCtxt<'tcx>>,
     ) -> PlaceholderIndex {
         self.indices.get_index_of(&placeholder).unwrap().into()
     }
 
     pub(crate) fn lookup_placeholder(
         &self,
         placeholder: PlaceholderIndex,
-    ) -> ty::PlaceholderRegion<'tcx> {
+    ) -> ty::PlaceholderRegion<TyCtxt<'tcx>> {
         self.indices[placeholder.index()]
     }
 
@@ -362,7 +365,7 @@ impl<'tcx, N: Idx> RegionValues<'tcx, N> {
     pub(crate) fn placeholders_contained_in(
         &self,
         r: N,
-    ) -> impl Iterator<Item = ty::PlaceholderRegion<'tcx>> {
+    ) -> impl Iterator<Item = ty::PlaceholderRegion<TyCtxt<'tcx>>> {
         self.placeholders
             .row(r)
             .into_iter()
@@ -417,7 +420,7 @@ impl ToElementIndex<'_> for RegionVid {
     }
 }
 
-impl<'tcx> ToElementIndex<'tcx> for ty::PlaceholderRegion<'tcx> {
+impl<'tcx> ToElementIndex<'tcx> for ty::PlaceholderRegion<TyCtxt<'tcx>> {
     fn add_to_row<N: Idx>(self, values: &mut RegionValues<'tcx, N>, row: N) -> bool
     where
         Self: Into<ty::Placeholder<TyCtxt<'tcx>, ty::BoundRegion>>,

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -289,7 +289,7 @@ impl<'tcx> MirTypeckRegionConstraints<'tcx> {
     pub(crate) fn placeholder_region(
         &mut self,
         infcx: &InferCtxt<'tcx>,
-        placeholder: ty::PlaceholderRegion<'tcx>,
+        placeholder: ty::PlaceholderRegion<TyCtxt<'tcx>>,
     ) -> ty::Region<'tcx> {
         let placeholder_index = self.placeholder_indices.insert(placeholder);
         match self.placeholder_index_to_region.get(placeholder_index) {

compiler/rustc_borrowck/src/type_check/relate_tys.rs

@@ -259,7 +259,7 @@ impl<'a, 'b, 'tcx> NllTypeRelating<'a, 'b, 'tcx> {
     #[instrument(skip(self), level = "debug")]
     fn next_placeholder_region(
         &mut self,
-        placeholder: ty::PlaceholderRegion<'tcx>,
+        placeholder: ty::PlaceholderRegion<TyCtxt<'tcx>>,
     ) -> ty::Region<'tcx> {
         let reg =
             self.type_checker.constraints.placeholder_region(self.type_checker.infcx, placeholder);

compiler/rustc_infer/src/infer/mod.rs

@@ -465,7 +465,7 @@ pub enum NllRegionVariableOrigin<'tcx> {
 
     /// "Universal" instantiation of a higher-ranked region (e.g.,
     /// from a `for<'a> T` binder). Meant to represent "any region".
-    Placeholder(ty::PlaceholderRegion<'tcx>),
+    Placeholder(ty::PlaceholderRegion<TyCtxt<'tcx>>),
 
     Existential {
         name: Option<Symbol>,

compiler/rustc_infer/src/infer/outlives/obligations.rs

@@ -394,7 +394,7 @@ where
         &mut self,
         origin: infer::SubregionOrigin<'tcx>,
         region: ty::Region<'tcx>,
-        placeholder_ty: ty::PlaceholderType<'tcx>,
+        placeholder_ty: ty::PlaceholderType<TyCtxt<'tcx>>,
     ) {
         let verify_bound = self
             .verify_bound

compiler/rustc_infer/src/infer/region_constraints/leak_check.rs

@@ -105,7 +105,7 @@ struct LeakCheck<'a, 'tcx> {
     // is repurposed to store some placeholder `P` such that the weaker
     // condition `S: P` must hold. (This is true if `S: S1` transitively and `S1
     // = P`.)
-    scc_placeholders: IndexVec<LeakCheckScc, Option<ty::PlaceholderRegion<'tcx>>>,
+    scc_placeholders: IndexVec<LeakCheckScc, Option<ty::PlaceholderRegion<TyCtxt<'tcx>>>>,
 
     // For each SCC S, track the minimum universe that flows into it. Note that
     // this is both the minimum of the universes for every region that is a
@@ -258,15 +258,15 @@ impl<'a, 'tcx> LeakCheck<'a, 'tcx> {
 
     fn placeholder_error(
         &self,
-        placeholder1: ty::PlaceholderRegion<'tcx>,
-        placeholder2: ty::PlaceholderRegion<'tcx>,
+        placeholder1: ty::PlaceholderRegion<TyCtxt<'tcx>>,
+        placeholder2: ty::PlaceholderRegion<TyCtxt<'tcx>>,
     ) -> TypeError<'tcx> {
         self.error(placeholder1, ty::Region::new_placeholder(self.tcx, placeholder2))
     }
 
     fn error(
         &self,
-        placeholder: ty::PlaceholderRegion<'tcx>,
+        placeholder: ty::PlaceholderRegion<TyCtx<'tcx>>,
         other_region: ty::Region<'tcx>,
     ) -> TypeError<'tcx> {
         debug!("error: placeholder={:?}, other_region={:?}", placeholder, other_region);

compiler/rustc_infer/src/infer/region_constraints/mod.rs

@@ -125,7 +125,7 @@ pub struct Verify<'tcx> {
 #[derive(Copy, Clone, PartialEq, Eq, Hash, TypeFoldable, TypeVisitable)]
 pub enum GenericKind<'tcx> {
     Param(ty::ParamTy),
-    Placeholder(ty::PlaceholderType<'tcx>),
+    Placeholder(ty::PlaceholderType<TyCtxt<'tcx>>),
     Alias(ty::AliasTy<'tcx>),
 }
 

compiler/rustc_middle/src/ty/consts.rs

@@ -109,7 +109,7 @@ impl<'tcx> Const<'tcx> {
     #[inline]
     pub fn new_placeholder(
         tcx: TyCtxt<'tcx>,
-        placeholder: ty::PlaceholderConst<'tcx>,
+        placeholder: ty::PlaceholderConst<TyCtxt<'tcx>>,
     ) -> Const<'tcx> {
         Const::new(tcx, ty::ConstKind::Placeholder(placeholder))
     }
@@ -195,7 +195,7 @@ impl<'tcx> rustc_type_ir::inherent::Const<TyCtxt<'tcx>> for Const<'tcx> {
         Const::new_canonical_bound(tcx, var)
     }
 
-    fn new_placeholder(tcx: TyCtxt<'tcx>, placeholder: ty::PlaceholderConst<'tcx>) -> Self {
+    fn new_placeholder(tcx: TyCtxt<'tcx>, placeholder: ty::PlaceholderConst<TyCtxt<'tcx>>) -> Self {
         Const::new_placeholder(tcx, placeholder)
     }
 

compiler/rustc_middle/src/ty/context.rs

@@ -145,10 +145,10 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
 
     type FnInputTys = &'tcx [Ty<'tcx>];
     type ParamTy = ParamTy;
-    type BoundTy = ty::BoundTy;
+    //type BoundTy = ty::BoundTy;
     type Symbol = Symbol;
 
-    type PlaceholderTy = ty::PlaceholderType<'tcx>;
+    type PlaceholderTy = ty::PlaceholderType<TyCtxt<'tcx>>;
     type ErrorGuaranteed = ErrorGuaranteed;
     type BoundExistentialPredicates = &'tcx List<PolyExistentialPredicate<'tcx>>;
 
@@ -158,10 +158,10 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
     type Safety = hir::Safety;
     type Abi = ExternAbi;
     type Const = ty::Const<'tcx>;
-    type PlaceholderConst = ty::PlaceholderConst<'tcx>;
+    //type PlaceholderConst = ty::PlaceholderConst<'tcx>;
 
     type ParamConst = ty::ParamConst;
-    type BoundConst = ty::BoundConst;
+    //type BoundConst = ty::BoundConst;
     type ValueConst = ty::Value<'tcx>;
     type ExprConst = ty::Expr<'tcx>;
     type ValTree = ty::ValTree<'tcx>;
@@ -170,7 +170,10 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
     type EarlyParamRegion = ty::EarlyParamRegion;
     type LateParamRegion = ty::LateParamRegion;
     type BoundRegion = ty::BoundRegion;
-    type PlaceholderRegion = ty::PlaceholderRegion<'tcx>;
+    type BoundRegionKind = ty::BoundRegionKind;
+    type BoundVariableKind = ty::BoundVariableKind;
+    type BoundTyKind = ty::BoundTyKind;
+    //type PlaceholderRegion = ty::PlaceholderRegion<TyCtxt<'tcx>>;
 
     type RegionAssumptions = &'tcx ty::List<ty::ArgOutlivesPredicate<'tcx>>;