rename, add inline

compiler-errors · compiler-errors · commit d1ed286efcd4 · 2022-11-19T18:41:12.000Z
diff --git a/compiler/rustc_hir_analysis/src/check/dropck.rs b/compiler/rustc_hir_analysis/src/check/dropck.rs
@@ -248,7 +248,8 @@ impl<'tcx> TypeRelation<'tcx> for SimpleEqRelation<'tcx> {
         self.param_env
     }
 
-    fn fast_equate_combine(&self) -> bool {
+    #[inline]
+    fn fast_equate(&self) -> bool {
         true
     }
 
diff --git a/compiler/rustc_infer/src/infer/combine.rs b/compiler/rustc_infer/src/infer/combine.rs
@@ -525,7 +525,8 @@ impl<'tcx> TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
         self.param_env
     }
 
-    fn fast_equate_combine(&self) -> bool {
+    #[inline]
+    fn fast_equate(&self) -> bool {
         false
     }
 
@@ -806,7 +807,8 @@ impl<'tcx> TypeRelation<'tcx> for ConstInferUnifier<'_, 'tcx> {
         self.param_env
     }
 
-    fn fast_equate_combine(&self) -> bool {
+    #[inline]
+    fn fast_equate(&self) -> bool {
         false
     }
 
diff --git a/compiler/rustc_infer/src/infer/equate.rs b/compiler/rustc_infer/src/infer/equate.rs
@@ -32,7 +32,8 @@ impl<'tcx> TypeRelation<'tcx> for Equate<'_, '_, 'tcx> {
         self.fields.tcx()
     }
 
-    fn fast_equate_combine(&self) -> bool {
+    #[inline]
+    fn fast_equate(&self) -> bool {
         true
     }
 
diff --git a/compiler/rustc_infer/src/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
@@ -2945,7 +2945,8 @@ impl<'tcx> TypeRelation<'tcx> for SameTypeModuloInfer<'_, 'tcx> {
         "SameTypeModuloInfer"
     }
 
-    fn fast_equate_combine(&self) -> bool {
+    #[inline]
+    fn fast_equate(&self) -> bool {
         true
     }
 
diff --git a/compiler/rustc_infer/src/infer/glb.rs b/compiler/rustc_infer/src/infer/glb.rs
@@ -34,7 +34,8 @@ impl<'tcx> TypeRelation<'tcx> for Glb<'_, '_, 'tcx> {
         self.fields.tcx()
     }
 
-    fn fast_equate_combine(&self) -> bool {
+    #[inline]
+    fn fast_equate(&self) -> bool {
         true
     }
 
diff --git a/compiler/rustc_infer/src/infer/lub.rs b/compiler/rustc_infer/src/infer/lub.rs
@@ -34,7 +34,8 @@ impl<'tcx> TypeRelation<'tcx> for Lub<'_, '_, 'tcx> {
         self.fields.tcx()
     }
 
-    fn fast_equate_combine(&self) -> bool {
+    #[inline]
+    fn fast_equate(&self) -> bool {
         true
     }
 
diff --git a/compiler/rustc_infer/src/infer/nll_relate/mod.rs b/compiler/rustc_infer/src/infer/nll_relate/mod.rs
@@ -535,7 +535,8 @@ where
         self.delegate.param_env()
     }
 
-    fn fast_equate_combine(&self) -> bool {
+    #[inline]
+    fn fast_equate(&self) -> bool {
         false
     }
 
@@ -905,7 +906,8 @@ where
         self.delegate.param_env()
     }
 
-    fn fast_equate_combine(&self) -> bool {
+    #[inline]
+    fn fast_equate(&self) -> bool {
         false
     }
 
diff --git a/compiler/rustc_infer/src/infer/outlives/test_type_match.rs b/compiler/rustc_infer/src/infer/outlives/test_type_match.rs
@@ -142,7 +142,8 @@ impl<'tcx> TypeRelation<'tcx> for Match<'tcx> {
     fn param_env(&self) -> ty::ParamEnv<'tcx> {
         self.param_env
     }
-    fn fast_equate_combine(&self) -> bool {
+    #[inline]
+    fn fast_equate(&self) -> bool {
         false
     }
     fn a_is_expected(&self) -> bool {
diff --git a/compiler/rustc_infer/src/infer/sub.rs b/compiler/rustc_infer/src/infer/sub.rs
@@ -43,7 +43,8 @@ impl<'tcx> TypeRelation<'tcx> for Sub<'_, '_, 'tcx> {
         self.fields.param_env
     }
 
-    fn fast_equate_combine(&self) -> bool {
+    #[inline]
+    fn fast_equate(&self) -> bool {
         true
     }
 
diff --git a/compiler/rustc_middle/src/ty/_match.rs b/compiler/rustc_middle/src/ty/_match.rs
@@ -39,7 +39,8 @@ impl<'tcx> TypeRelation<'tcx> for Match<'tcx> {
     fn param_env(&self) -> ty::ParamEnv<'tcx> {
         self.param_env
     }
-    fn fast_equate_combine(&self) -> bool {
+    #[inline]
+    fn fast_equate(&self) -> bool {
         false
     }
     fn a_is_expected(&self) -> bool {
diff --git a/compiler/rustc_middle/src/ty/relate.rs b/compiler/rustc_middle/src/ty/relate.rs
@@ -29,7 +29,7 @@ pub trait TypeRelation<'tcx>: Sized {
     fn tag(&self) -> &'static str;
 
     /// Returns whether or not structural equality can be used to fast-path this relation
-    fn fast_equate_combine(&self) -> bool;
+    fn fast_equate(&self) -> bool;
 
     /// Returns `true` if the value `a` is the "expected" type in the
     /// relation. Just affects error messages.
@@ -143,7 +143,7 @@ pub fn relate_substs<'tcx, R: TypeRelation<'tcx>>(
     a_subst: SubstsRef<'tcx>,
     b_subst: SubstsRef<'tcx>,
 ) -> RelateResult<'tcx, SubstsRef<'tcx>> {
-    if relation.fast_equate_combine() && a_subst == b_subst {
+    if relation.fast_equate() && a_subst == b_subst {
         return Ok(a_subst);
     }
 
@@ -159,7 +159,7 @@ pub fn relate_substs_with_variances<'tcx, R: TypeRelation<'tcx>>(
     a_subst: SubstsRef<'tcx>,
     b_subst: SubstsRef<'tcx>,
 ) -> RelateResult<'tcx, SubstsRef<'tcx>> {
-    if relation.fast_equate_combine() && a_subst == b_subst {
+    if relation.fast_equate() && a_subst == b_subst {
         return Ok(a_subst);
     }
 
@@ -365,7 +365,7 @@ impl<'tcx> Relate<'tcx> for GeneratorWitness<'tcx> {
         a: GeneratorWitness<'tcx>,
         b: GeneratorWitness<'tcx>,
     ) -> RelateResult<'tcx, GeneratorWitness<'tcx>> {
-        if relation.fast_equate_combine() && a == b {
+        if relation.fast_equate() && a == b {
             return Ok(a);
         }
 
@@ -670,7 +670,7 @@ impl<'tcx> Relate<'tcx> for &'tcx ty::List<ty::Binder<'tcx, ty::ExistentialPredi
         a: Self,
         b: Self,
     ) -> RelateResult<'tcx, Self> {
-        if relation.fast_equate_combine() && a == b {
+        if relation.fast_equate() && a == b {
             return Ok(a);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,8 @@ impl<'tcx> TypeRelation<'tcx> for SimpleEqRelation<'tcx> {`
`248`	`248`	`self.param_env`
`249`	`249`	`}`
`250`	`250`
`251`		`- fn fast_equate_combine(&self) -> bool {`
	`251`	`+ #[inline]`
	`252`	`+ fn fast_equate(&self) -> bool {`
`252`	`253`	`true`
`253`	`254`	`}`
`254`	`255`
Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,8 @@ impl<'tcx> TypeRelation<'tcx> for Generalizer<'_, 'tcx> {`
`525`	`525`	`self.param_env`
`526`	`526`	`}`
`527`	`527`
`528`		`- fn fast_equate_combine(&self) -> bool {`
	`528`	`+ #[inline]`
	`529`	`+ fn fast_equate(&self) -> bool {`
`529`	`530`	`false`
`530`	`531`	`}`
`531`	`532`
`@@ -806,7 +807,8 @@ impl<'tcx> TypeRelation<'tcx> for ConstInferUnifier<'_, 'tcx> {`
`806`	`807`	`self.param_env`
`807`	`808`	`}`
`808`	`809`
`809`		`- fn fast_equate_combine(&self) -> bool {`
	`810`	`+ #[inline]`
	`811`	`+ fn fast_equate(&self) -> bool {`
`810`	`812`	`false`
`811`	`813`	`}`
`812`	`814`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ impl<'tcx> TypeRelation<'tcx> for Equate<'_, '_, 'tcx> {`
`32`	`32`	`self.fields.tcx()`
`33`	`33`	`}`
`34`	`34`
`35`		`- fn fast_equate_combine(&self) -> bool {`
	`35`	`+ #[inline]`
	`36`	`+ fn fast_equate(&self) -> bool {`
`36`	`37`	`true`
`37`	`38`	`}`
`38`	`39`
Original file line number	Diff line number	Diff line change
`@@ -2945,7 +2945,8 @@ impl<'tcx> TypeRelation<'tcx> for SameTypeModuloInfer<'_, 'tcx> {`
`2945`	`2945`	`"SameTypeModuloInfer"`
`2946`	`2946`	`}`
`2947`	`2947`
`2948`		`- fn fast_equate_combine(&self) -> bool {`
	`2948`	`+ #[inline]`
	`2949`	`+ fn fast_equate(&self) -> bool {`
`2949`	`2950`	`true`
`2950`	`2951`	`}`
`2951`	`2952`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ impl<'tcx> TypeRelation<'tcx> for Glb<'_, '_, 'tcx> {`
`34`	`34`	`self.fields.tcx()`
`35`	`35`	`}`
`36`	`36`
`37`		`- fn fast_equate_combine(&self) -> bool {`
	`37`	`+ #[inline]`
	`38`	`+ fn fast_equate(&self) -> bool {`
`38`	`39`	`true`
`39`	`40`	`}`
`40`	`41`
Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,8 @@ where`
`535`	`535`	`self.delegate.param_env()`
`536`	`536`	`}`
`537`	`537`
`538`		`- fn fast_equate_combine(&self) -> bool {`
	`538`	`+ #[inline]`
	`539`	`+ fn fast_equate(&self) -> bool {`
`539`	`540`	`false`
`540`	`541`	`}`
`541`	`542`
`@@ -905,7 +906,8 @@ where`
`905`	`906`	`self.delegate.param_env()`
`906`	`907`	`}`
`907`	`908`
`908`		`- fn fast_equate_combine(&self) -> bool {`
	`909`	`+ #[inline]`
	`910`	`+ fn fast_equate(&self) -> bool {`
`909`	`911`	`false`
`910`	`912`	`}`
`911`	`913`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,8 @@ impl<'tcx> TypeRelation<'tcx> for Match<'tcx> {`
`142`	`142`	`fn param_env(&self) -> ty::ParamEnv<'tcx> {`
`143`	`143`	`self.param_env`
`144`	`144`	`}`
`145`		`- fn fast_equate_combine(&self) -> bool {`
	`145`	`+ #[inline]`
	`146`	`+ fn fast_equate(&self) -> bool {`
`146`	`147`	`false`
`147`	`148`	`}`
`148`	`149`	`fn a_is_expected(&self) -> bool {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ impl<'tcx> TypeRelation<'tcx> for Sub<'_, '_, 'tcx> {`
`43`	`43`	`self.fields.param_env`
`44`	`44`	`}`
`45`	`45`
`46`		`- fn fast_equate_combine(&self) -> bool {`
	`46`	`+ #[inline]`
	`47`	`+ fn fast_equate(&self) -> bool {`
`47`	`48`	`true`
`48`	`49`	`}`
`49`	`50`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ impl<'tcx> TypeRelation<'tcx> for Match<'tcx> {`
`39`	`39`	`fn param_env(&self) -> ty::ParamEnv<'tcx> {`
`40`	`40`	`self.param_env`
`41`	`41`	`}`
`42`		`- fn fast_equate_combine(&self) -> bool {`
	`42`	`+ #[inline]`
	`43`	`+ fn fast_equate(&self) -> bool {`
`43`	`44`	`false`
`44`	`45`	`}`
`45`	`46`	`fn a_is_expected(&self) -> bool {`