diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2022-06-23 16:35:47 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2022-06-23 16:35:47 -0400 |
| commit | 27e0f7a8864ebd64eda4737f74b1324a98da2e95 (patch) | |
| tree | b4b038766d8f8ab2068a4da29595304c8219b2a7 | |
| parent | 893b919e64b59c04dbd7c88e74ba138ff8e22a64 (diff) | |
| download | rust-27e0f7a8864ebd64eda4737f74b1324a98da2e95.tar.gz rust-27e0f7a8864ebd64eda4737f74b1324a98da2e95.zip | |
rename IfEqBound to IfEq
5 files changed, 11 insertions, 11 deletions
diff --git a/compiler/rustc_borrowck/src/region_infer/mod.rs b/compiler/rustc_borrowck/src/region_infer/mod.rs index 56045166060..d45cdc0c990 100644 --- a/compiler/rustc_borrowck/src/region_infer/mod.rs +++ b/compiler/rustc_borrowck/src/region_infer/mod.rs @@ -1191,8 +1191,8 @@ impl<'tcx> RegionInferenceContext<'tcx> { debug!("eval_verify_bound(lower_bound={:?}, verify_bound={:?})", lower_bound, verify_bound); match verify_bound { - VerifyBound::IfEqBound(verify_if_eq_b) => { - self.eval_if_eq_bound(infcx, param_env, generic_ty, lower_bound, *verify_if_eq_b) + VerifyBound::IfEq(verify_if_eq_b) => { + self.eval_if_eq(infcx, param_env, generic_ty, lower_bound, *verify_if_eq_b) } VerifyBound::IsEmpty => { @@ -1229,7 +1229,7 @@ impl<'tcx> RegionInferenceContext<'tcx> { } } - fn eval_if_eq_bound( + fn eval_if_eq( &self, infcx: &InferCtxt<'_, 'tcx>, param_env: ty::ParamEnv<'tcx>, @@ -1239,7 +1239,7 @@ impl<'tcx> RegionInferenceContext<'tcx> { ) -> bool { let generic_ty = self.normalize_to_scc_representatives(infcx.tcx, generic_ty); let verify_if_eq_b = self.normalize_to_scc_representatives(infcx.tcx, verify_if_eq_b); - match test_type_match::extract_verify_if_eq_bound( + match test_type_match::extract_verify_if_eq( infcx.tcx, param_env, &verify_if_eq_b, diff --git a/compiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs b/compiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs index 51943f9f38c..9fa374a53fc 100644 --- a/compiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs +++ b/compiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs @@ -822,8 +822,8 @@ impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> { min: ty::Region<'tcx>, ) -> bool { match bound { - VerifyBound::IfEqBound(verify_if_eq_b) => { - match test_type_match::extract_verify_if_eq_bound( + VerifyBound::IfEq(verify_if_eq_b) => { + match test_type_match::extract_verify_if_eq( self.tcx(), self.param_env, verify_if_eq_b, diff --git a/compiler/rustc_infer/src/infer/outlives/test_type_match.rs b/compiler/rustc_infer/src/infer/outlives/test_type_match.rs index bdd31dafd90..efb889cdefb 100644 --- a/compiler/rustc_infer/src/infer/outlives/test_type_match.rs +++ b/compiler/rustc_infer/src/infer/outlives/test_type_match.rs @@ -35,7 +35,7 @@ use crate::infer::region_constraints::VerifyIfEq; /// very late in inference and hence cannot make use of the normal inference /// machinery. #[tracing::instrument(level = "Debug", skip(tcx, param_env))] -pub fn extract_verify_if_eq_bound<'tcx>( +pub fn extract_verify_if_eq<'tcx>( tcx: TyCtxt<'tcx>, param_env: ty::ParamEnv<'tcx>, verify_if_eq_b: &ty::Binder<'tcx, VerifyIfEq<'tcx>>, diff --git a/compiler/rustc_infer/src/infer/outlives/verify.rs b/compiler/rustc_infer/src/infer/outlives/verify.rs index a88bcdaef58..ce3da267b00 100644 --- a/compiler/rustc_infer/src/infer/outlives/verify.rs +++ b/compiler/rustc_infer/src/infer/outlives/verify.rs @@ -173,7 +173,7 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> { VerifyBound::OutlivedBy(r) } else { let verify_if_eq_b = binder.map_bound(|ty::OutlivesPredicate(ty, bound)| VerifyIfEq { ty, bound }); - VerifyBound::IfEqBound(verify_if_eq_b) + VerifyBound::IfEq(verify_if_eq_b) } }); diff --git a/compiler/rustc_infer/src/infer/region_constraints/mod.rs b/compiler/rustc_infer/src/infer/region_constraints/mod.rs index ab76f41414a..f93c9a31be6 100644 --- a/compiler/rustc_infer/src/infer/region_constraints/mod.rs +++ b/compiler/rustc_infer/src/infer/region_constraints/mod.rs @@ -228,7 +228,7 @@ pub enum VerifyBound<'tcx> { /// } /// } /// ``` - IfEqBound(ty::Binder<'tcx, VerifyIfEq<'tcx>>), + IfEq(ty::Binder<'tcx, VerifyIfEq<'tcx>>), /// Given a region `R`, expands to the function: /// @@ -807,7 +807,7 @@ impl<'tcx> GenericKind<'tcx> { impl<'tcx> VerifyBound<'tcx> { pub fn must_hold(&self) -> bool { match self { - VerifyBound::IfEqBound(..) => false, + VerifyBound::IfEq(..) => false, VerifyBound::OutlivedBy(re) => re.is_static(), VerifyBound::IsEmpty => false, VerifyBound::AnyBound(bs) => bs.iter().any(|b| b.must_hold()), @@ -817,7 +817,7 @@ impl<'tcx> VerifyBound<'tcx> { pub fn cannot_hold(&self) -> bool { match self { - VerifyBound::IfEqBound(..) => false, + VerifyBound::IfEq(..) => false, VerifyBound::IsEmpty => false, VerifyBound::OutlivedBy(_) => false, VerifyBound::AnyBound(bs) => bs.iter().all(|b| b.cannot_hold()), |
