Refactor functions used by HasEscapingVarsVisitor

Author: eggyal

compiler/rustc_middle/src/ty/consts.rs

@@ -239,6 +239,12 @@ impl<'tcx> Const<'tcx> {
     }
 }
 
+impl<'tcx> ty::BoundIndex for Const<'tcx> {
+    fn bound_index(&self) -> Option<ty::DebruijnIndex> {
+        if let ty::ConstKind::Bound(debruijn, _) = self.kind() { Some(debruijn) } else { None }
+    }
+}
+
 pub fn const_param_default(tcx: TyCtxt<'_>, def_id: DefId) -> ty::EarlyBinder<Const<'_>> {
     let default_def_id = match tcx.hir().get_by_def_id(def_id.expect_local()) {
         hir::Node::GenericParam(hir::GenericParam {

compiler/rustc_middle/src/ty/flags.rs

@@ -1,5 +1,5 @@
 use crate::ty::subst::{GenericArg, GenericArgKind};
-use crate::ty::{self, InferConst, Ty, TypeFlags};
+use crate::ty::{self, InferConst, OuterExclusiveBinder, Ty, TypeFlags};
 use std::slice;
 
 #[derive(Debug)]

compiler/rustc_middle/src/ty/mod.rs

@@ -479,11 +479,6 @@ impl<'tcx> Predicate<'tcx> {
         self.0.flags
     }
 
-    #[inline(always)]
-    pub fn outer_exclusive_binder(self) -> DebruijnIndex {
-        self.0.outer_exclusive_binder
-    }
-
     /// Flips the polarity of a Predicate.
     ///
     /// Given `T: Trait` predicate it returns `T: !Trait` and given `T: !Trait` returns `T: Trait`.
@@ -557,6 +552,13 @@ impl<'tcx> Predicate<'tcx> {
     }
 }
 
+impl<'tcx> ty::OuterExclusiveBinder for Predicate<'tcx> {
+    #[inline(always)]
+    fn outer_exclusive_binder(self) -> DebruijnIndex {
+        self.0.outer_exclusive_binder
+    }
+}
+
 impl rustc_errors::IntoDiagnosticArg for Predicate<'_> {
     fn into_diagnostic_arg(self) -> rustc_errors::DiagnosticArgValue<'static> {
         rustc_errors::DiagnosticArgValue::Str(std::borrow::Cow::Owned(self.to_string()))

compiler/rustc_middle/src/ty/structural_impls.rs

@@ -7,7 +7,9 @@ use crate::mir::{Field, ProjectionKind};
 use crate::ty::fold::{FallibleTypeFolder, TypeFoldable, TypeSuperFoldable};
 use crate::ty::print::{with_no_trimmed_paths, FmtPrinter, Printer};
 use crate::ty::visit::{TypeSuperVisitable, TypeVisitable, TypeVisitor};
-use crate::ty::{self, AliasTy, InferConst, Lift, Term, TermKind, Ty, TyCtxt};
+use crate::ty::{
+    self, AliasTy, InferConst, Lift, OuterExclusiveBinder, Term, TermKind, Ty, TyCtxt,
+};
 use rustc_data_structures::functor::IdFunctor;
 use rustc_hir::def::Namespace;
 use rustc_index::vec::{Idx, IndexVec};

compiler/rustc_middle/src/ty/sty.rs

@@ -1646,14 +1646,6 @@ impl<'tcx> Region<'tcx> {
         matches!(*self, ty::RePlaceholder(..))
     }
 
-    #[inline]
-    pub fn bound_at_or_above_binder(self, index: ty::DebruijnIndex) -> bool {
-        match *self {
-            ty::ReLateBound(debruijn, _) => debruijn >= index,
-            _ => false,
-        }
-    }
-
     pub fn type_flags(self) -> TypeFlags {
         let mut flags = TypeFlags::empty();
 
@@ -1738,6 +1730,16 @@ impl<'tcx> Region<'tcx> {
     }
 }
 
+impl<'tcx> ty::BoundAtOrAboveBinder for Region<'tcx> {
+    #[inline]
+    fn bound_at_or_above_binder(self, index: ty::DebruijnIndex) -> bool {
+        match *self {
+            ty::ReLateBound(debruijn, _) => debruijn >= index,
+            _ => false,
+        }
+    }
+}
+
 /// Type utilities
 impl<'tcx> Ty<'tcx> {
     #[inline(always)]

compiler/rustc_middle/src/ty/util.rs

@@ -1157,9 +1157,11 @@ impl<'tcx> Ty<'tcx> {
         }
         ty
     }
+}
 
+impl<'tcx> ty::OuterExclusiveBinder for Ty<'tcx> {
     #[inline]
-    pub fn outer_exclusive_binder(self) -> ty::DebruijnIndex {
+    fn outer_exclusive_binder(self) -> ty::DebruijnIndex {
         self.0.outer_exclusive_binder
     }
 }

compiler/rustc_middle/src/ty/visit.rs

@@ -38,7 +38,10 @@
 //!     - ty.super_visit_with(visitor)
 //! - u.visit_with(visitor)
 //! ```
-use crate::ty::{self, flags::FlagComputation, Binder, Ty, TyCtxt, TypeFlags};
+use crate::ty::{
+    self, flags::FlagComputation, Binder, BoundAtOrAboveBinder, BoundIndex, OuterExclusiveBinder,
+    Ty, TyCtxt, TypeFlags,
+};
 use rustc_errors::ErrorGuaranteed;
 
 use rustc_data_structures::fx::FxHashSet;
@@ -537,10 +540,8 @@ impl<'tcx> TypeVisitor<'tcx> for HasEscapingVarsVisitor {
         // otherwise we do want to remember to visit the rest of the
         // const, as it has types/regions embedded in a lot of other
         // places.
-        match ct.kind() {
-            ty::ConstKind::Bound(debruijn, _) if debruijn >= self.outer_index => {
-                ControlFlow::Break(FoundEscapingVars)
-            }
+        match ct.bound_index() {
+            Some(debruijn) if debruijn >= self.outer_index => ControlFlow::Break(FoundEscapingVars),
             _ => ct.super_visit_with(self),
         }
     }

compiler/rustc_trait_selection/src/traits/query/normalize.rs

@@ -13,7 +13,7 @@ use rustc_data_structures::stack::ensure_sufficient_stack;
 use rustc_infer::traits::Normalized;
 use rustc_middle::ty::fold::{FallibleTypeFolder, TypeFoldable, TypeSuperFoldable};
 use rustc_middle::ty::visit::{TypeSuperVisitable, TypeVisitable};
-use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitor};
+use rustc_middle::ty::{self, OuterExclusiveBinder, Ty, TyCtxt, TypeVisitor};
 use rustc_span::DUMMY_SP;
 
 use std::ops::ControlFlow;

compiler/rustc_type_ir/src/lib.rs

@@ -32,9 +32,9 @@ pub trait Interner {
     type AdtDef: Clone + Debug + Hash + PartialEq + Eq + PartialOrd + Ord;
     type SubstsRef: Clone + Debug + Hash + PartialEq + Eq + PartialOrd + Ord;
     type DefId: Clone + Debug + Hash + PartialEq + Eq + PartialOrd + Ord;
-    type Ty: Clone + Debug + Hash + PartialEq + Eq + PartialOrd + Ord;
-    type Const: Clone + Debug + Hash + PartialEq + Eq + PartialOrd + Ord;
-    type Region: Clone + Debug + Hash + PartialEq + Eq + PartialOrd + Ord;
+    type Ty: Clone + Debug + Hash + PartialEq + Eq + PartialOrd + Ord + OuterExclusiveBinder;
+    type Const: Clone + Debug + Hash + PartialEq + Eq + PartialOrd + Ord + BoundIndex;
+    type Region: Clone + Debug + Hash + PartialEq + Eq + PartialOrd + Ord + BoundAtOrAboveBinder;
     type TypeAndMut: Clone + Debug + Hash + PartialEq + Eq + PartialOrd + Ord;
     type Mutability: Clone + Debug + Hash + PartialEq + Eq + PartialOrd + Ord;
     type Movability: Clone + Debug + Hash + PartialEq + Eq + PartialOrd + Ord;
@@ -836,3 +836,15 @@ impl UniverseIndex {
         self.private < other.private
     }
 }
+
+pub trait OuterExclusiveBinder {
+    fn outer_exclusive_binder(self) -> DebruijnIndex;
+}
+
+pub trait BoundAtOrAboveBinder {
+    fn bound_at_or_above_binder(self, index: DebruijnIndex) -> bool;
+}
+
+pub trait BoundIndex {
+    fn bound_index(&self) -> Option<DebruijnIndex>;
+}