From 1f7d1eae9677f16a94a15b58d2b2477ad0776bd7 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Tue, 16 Aug 2022 15:33:46 +0200 Subject: [PATCH] Use `merged_ty` method instead of rewriting it every time --- compiler/rustc_typeck/src/check/coercion.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_typeck/src/check/coercion.rs b/compiler/rustc_typeck/src/check/coercion.rs index da575cb1367b8..def592c46c2e5 100644 --- a/compiler/rustc_typeck/src/check/coercion.rs +++ b/compiler/rustc_typeck/src/check/coercion.rs @@ -1488,14 +1488,14 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> { // `break`, we want to call the `()` "expected" // since it is implied by the syntax. // (Note: not all force-units work this way.)" - (expression_ty, self.final_ty.unwrap_or(self.expected_ty)) + (expression_ty, self.merged_ty()) } else { // Otherwise, the "expected" type for error // reporting is the current unification type, // which is basically the LUB of the expressions // we've seen so far (combined with the expected // type) - (self.final_ty.unwrap_or(self.expected_ty), expression_ty) + (self.merged_ty(), expression_ty) }; let (expected, found) = fcx.resolve_vars_if_possible((expected, found));