Uplift EarlyBinder

Author: compiler-errors

Cargo.lock

@@ -4686,6 +4686,7 @@ dependencies = [
 "rustc_span",
 "rustc_type_ir_macros",
 "smallvec",
+"tracing",
 ]
 
 [[package]]

compiler/rustc_middle/src/ty/consts.rs

@@ -184,6 +184,15 @@ impl<'tcx> rustc_type_ir::inherent::Const<TyCtxt<'tcx>> for Const<'tcx> {
 Const::new_var(tcx, vid, ty)
 }
 
+fnnew_bound(
+interner:TyCtxt<'tcx>,
+debruijn: ty::DebruijnIndex,
+var: ty::BoundVar,
+ty:Ty<'tcx>,
+) -> Self{
+Const::new_bound(interner, debruijn, var, ty)
+}
+
 fnnew_anon_bound(
 tcx:TyCtxt<'tcx>,
 debruijn: ty::DebruijnIndex,

compiler/rustc_middle/src/ty/fold.rs

@@ -3,7 +3,9 @@ use rustc_data_structures::fx::FxIndexMap;
 use rustc_hir::def_id::DefId;
 use tracing::{debug, instrument};
 
-pubuse rustc_type_ir::fold::{FallibleTypeFolder,TypeFoldable,TypeFolder,TypeSuperFoldable};
+pubuse rustc_type_ir::fold::{
+ shift_region, shift_vars,FallibleTypeFolder,TypeFoldable,TypeFolder,TypeSuperFoldable,
+};
 
 ///////////////////////////////////////////////////////////////////////////
 // Some sample folders
@@ -412,103 +414,3 @@ impl<'tcx> TyCtxt<'tcx> {
 Binder::bind_with_vars(inner, bound_vars)
 }
 }
-
-///////////////////////////////////////////////////////////////////////////
-// Shifter
-//
-// Shifts the De Bruijn indices on all escaping bound vars by a
-// fixed amount. Useful in instantiation or when otherwise introducing
-// a binding level that is not intended to capture the existing bound
-// vars. See comment on `shift_vars_through_binders` method in
-// `rustc_middle/src/ty/generic_args.rs` for more details.
-
-structShifter<'tcx>{
-tcx:TyCtxt<'tcx>,
-current_index: ty::DebruijnIndex,
-amount:u32,
-}
-
-impl<'tcx>Shifter<'tcx>{
-pubfnnew(tcx:TyCtxt<'tcx>,amount:u32) -> Self{
-Shifter{ tcx,current_index: ty::INNERMOST, amount }
-}
-}
-
-impl<'tcx>TypeFolder<TyCtxt<'tcx>>forShifter<'tcx>{
-fninterner(&self) -> TyCtxt<'tcx>{
-self.tcx
-}
-
-fnfold_binder<T:TypeFoldable<TyCtxt<'tcx>>>(
-&mutself,
-t: ty::Binder<'tcx,T>,
-) -> ty::Binder<'tcx,T>{
-self.current_index.shift_in(1);
-let t = t.super_fold_with(self);
-self.current_index.shift_out(1);
- t
-}
-
-fnfold_region(&mutself,r: ty::Region<'tcx>) -> ty::Region<'tcx>{
-match*r {
- ty::ReBound(debruijn, br)if debruijn >= self.current_index => {
-let debruijn = debruijn.shifted_in(self.amount);
- ty::Region::new_bound(self.tcx, debruijn, br)
-}
- _ => r,
-}
-}
-
-fnfold_ty(&mutself,ty:Ty<'tcx>) -> Ty<'tcx>{
-match*ty.kind(){
- ty::Bound(debruijn, bound_ty)if debruijn >= self.current_index => {
-let debruijn = debruijn.shifted_in(self.amount);
-Ty::new_bound(self.tcx, debruijn, bound_ty)
-}
-
- _ if ty.has_vars_bound_at_or_above(self.current_index) => ty.super_fold_with(self),
- _ => ty,
-}
-}
-
-fnfold_const(&mutself,ct: ty::Const<'tcx>) -> ty::Const<'tcx>{
-iflet ty::ConstKind::Bound(debruijn, bound_ct) = ct.kind()
- && debruijn >= self.current_index
-{
-let debruijn = debruijn.shifted_in(self.amount);
- ty::Const::new_bound(self.tcx, debruijn, bound_ct, ct.ty())
-}else{
- ct.super_fold_with(self)
-}
-}
-
-fnfold_predicate(&mutself,p: ty::Predicate<'tcx>) -> ty::Predicate<'tcx>{
-if p.has_vars_bound_at_or_above(self.current_index){ p.super_fold_with(self)}else{ p }
-}
-}
-
-pubfnshift_region<'tcx>(
-tcx:TyCtxt<'tcx>,
-region: ty::Region<'tcx>,
-amount:u32,
-) -> ty::Region<'tcx>{
-match*region {
- ty::ReBound(debruijn, br)if amount > 0 => {
- ty::Region::new_bound(tcx, debruijn.shifted_in(amount), br)
-}
- _ => region,
-}
-}
-
-pubfnshift_vars<'tcx,T>(tcx:TyCtxt<'tcx>,value:T,amount:u32) -> T
-where
-T:TypeFoldable<TyCtxt<'tcx>>,
-{
-debug!("shift_vars(value={:?}, amount={})", value, amount);
-
-if amount == 0 || !value.has_escaping_bound_vars(){
-return value;
-}
-
- value.fold_with(&mutShifter::new(tcx, amount))
-}