From 2f9794b84a4ae882edd428c1c3764eec99cdebff Mon Sep 17 00:00:00 2001 From: Michael Goulet Date: Thu, 27 Oct 2022 15:41:50 +0000 Subject: remove _types from ocx method names --- compiler/rustc_traits/src/type_op.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/rustc_traits') diff --git a/compiler/rustc_traits/src/type_op.rs b/compiler/rustc_traits/src/type_op.rs index e0465121ad9..98cb3f21555 100644 --- a/compiler/rustc_traits/src/type_op.rs +++ b/compiler/rustc_traits/src/type_op.rs @@ -87,7 +87,7 @@ impl<'me, 'tcx> AscribeUserTypeCx<'me, 'tcx> { where T: ToTrace<'tcx>, { - Ok(self.ocx.equate_types(&ObligationCause::dummy_with_span(self.span), self.param_env, a, b)?) + Ok(self.ocx.eq(&ObligationCause::dummy_with_span(self.span), self.param_env, a, b)?) } fn prove_predicate(&self, predicate: Predicate<'tcx>, cause: ObligationCause<'tcx>) { @@ -176,7 +176,7 @@ fn type_op_eq<'tcx>( ) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, ()>>, NoSolution> { tcx.infer_ctxt().enter_canonical_trait_query(&canonicalized, |ocx, key| { let (param_env, Eq { a, b }) = key.into_parts(); - Ok(ocx.equate_types(&ObligationCause::dummy(), param_env, a, b)?) + Ok(ocx.eq(&ObligationCause::dummy(), param_env, a, b)?) }) } @@ -228,7 +228,7 @@ fn type_op_subtype<'tcx>( ) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, ()>>, NoSolution> { tcx.infer_ctxt().enter_canonical_trait_query(&canonicalized, |ocx, key| { let (param_env, Subtype { sub, sup }) = key.into_parts(); - Ok(ocx.sup_types(&ObligationCause::dummy(), param_env, sup, sub)?) + Ok(ocx.sup(&ObligationCause::dummy(), param_env, sup, sub)?) }) } -- cgit 1.4.1-3-g733a5