diff options
| author | Michael Goulet <michael@errs.io> | 2022-10-27 15:41:50 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2022-10-27 15:43:37 +0000 |
| commit | 2f9794b84a4ae882edd428c1c3764eec99cdebff (patch) | |
| tree | 6cf5e447fbaed939d98ff30c474dbfeb1f2d21db /compiler/rustc_traits/src | |
| parent | ce11ae5d0de03d23b770f4d7ee912c792678f09d (diff) | |
| download | rust-2f9794b84a4ae882edd428c1c3764eec99cdebff.tar.gz rust-2f9794b84a4ae882edd428c1c3764eec99cdebff.zip | |
remove _types from ocx method names
Diffstat (limited to 'compiler/rustc_traits/src')
| -rw-r--r-- | compiler/rustc_traits/src/type_op.rs | 6 |
1 files changed, 3 insertions, 3 deletions
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)?) }) } |
