Rename implied_outlives_bounds to implied_outlives_bounds_compat

Author: spastorino

compiler/rustc_middle/src/arena.rs

@@ -53,7 +53,7 @@ macro_rules! arena_types {
                         rustc_middle::traits::query::NormalizationResult<'tcx>
                     >
                 >,
-            [] implied_outlives_bounds:
+            [] implied_outlives_bounds_compat:
                 rustc_middle::infer::canonical::Canonical<'tcx,
                     rustc_middle::infer::canonical::QueryResponse<'tcx,
                         Vec<rustc_middle::traits::query::OutlivesBound<'tcx>>

compiler/rustc_middle/src/query/mod.rs

@@ -1953,7 +1953,7 @@ rustc_queries! {
         desc { "normalizing `{}`", goal.value }
     }
 
-    query implied_outlives_bounds(
+    query implied_outlives_bounds_compat(
         goal: CanonicalTyGoal<'tcx>
     ) -> Result<
         &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, Vec<OutlivesBound<'tcx>>>>,

compiler/rustc_trait_selection/src/traits/outlives_bounds.rs

@@ -11,7 +11,7 @@ pub use rustc_middle::traits::query::OutlivesBound;
 
 pub type Bounds<'a, 'tcx: 'a> = impl Iterator<Item = OutlivesBound<'tcx>> + 'a;
 pub trait InferCtxtExt<'a, 'tcx> {
-    fn implied_outlives_bounds(
+    fn implied_outlives_bounds_compat(
         &self,
         param_env: ty::ParamEnv<'tcx>,
         body_id: LocalDefId,
@@ -47,7 +47,7 @@ impl<'a, 'tcx: 'a> InferCtxtExt<'a, 'tcx> for InferCtxt<'tcx> {
     ///   into the inference context with this body-id.
     /// - `ty`, the type that we are supposed to assume is WF.
     #[instrument(level = "debug", skip(self, param_env, body_id), ret)]
-    fn implied_outlives_bounds(
+    fn implied_outlives_bounds_compat(
         &self,
         param_env: ty::ParamEnv<'tcx>,
         body_id: LocalDefId,
@@ -67,7 +67,7 @@ impl<'a, 'tcx: 'a> InferCtxtExt<'a, 'tcx> for InferCtxt<'tcx> {
         let mut canonical_var_values = OriginalQueryValues::default();
         let canonical_ty =
             self.canonicalize_query_keep_static(param_env.and(ty), &mut canonical_var_values);
-        let Ok(canonical_result) = self.tcx.implied_outlives_bounds(canonical_ty) else {
+        let Ok(canonical_result) = self.tcx.implied_outlives_bounds_compat(canonical_ty) else {
             return vec![];
         };
 
@@ -113,7 +113,7 @@ impl<'a, 'tcx: 'a> InferCtxtExt<'a, 'tcx> for InferCtxt<'tcx> {
             if !errors.is_empty() {
                 self.tcx.sess.delay_span_bug(
                     span,
-                    "implied_outlives_bounds failed to solve obligations from instantiation",
+                    "implied_outlives_bounds_compat failed to solve obligations from instantiation",
                 );
             }
         };
@@ -127,6 +127,7 @@ impl<'a, 'tcx: 'a> InferCtxtExt<'a, 'tcx> for InferCtxt<'tcx> {
         body_id: LocalDefId,
         tys: FxIndexSet<Ty<'tcx>>,
     ) -> Bounds<'a, 'tcx> {
-        tys.into_iter().flat_map(move |ty| self.implied_outlives_bounds(param_env, body_id, ty))
+        tys.into_iter()
+            .flat_map(move |ty| self.implied_outlives_bounds_compat(param_env, body_id, ty))
     }
 }

compiler/rustc_trait_selection/src/traits/query/type_op/implied_outlives_bounds.rs

@@ -45,7 +45,7 @@ impl<'tcx> super::QueryTypeOp<'tcx> for ImpliedOutlivesBounds<'tcx> {
             param_env.and(ty)
         });
 
-        tcx.implied_outlives_bounds(canonicalized)
+        tcx.implied_outlives_bounds_compat(canonicalized)
     }
 
     fn perform_locally_in_new_solver(

compiler/rustc_traits/src/implied_outlives_bounds.rs

@@ -12,10 +12,10 @@ use rustc_trait_selection::traits::query::type_op::implied_outlives_bounds::comp
 use rustc_trait_selection::traits::query::{CanonicalTyGoal, NoSolution};
 
 pub(crate) fn provide(p: &mut Providers) {
-    *p = Providers { implied_outlives_bounds, ..*p };
+    *p = Providers { implied_outlives_bounds_compat, ..*p };
 }
 
-fn implied_outlives_bounds<'tcx>(
+fn implied_outlives_bounds_compat<'tcx>(
     tcx: TyCtxt<'tcx>,
     goal: CanonicalTyGoal<'tcx>,
 ) -> Result<