From fe3f86c4b658c097ffa5c23a90a57a2861ecd036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=C3=A9nore=20Bouttefeux?= Date: Fri, 23 Apr 2021 12:51:01 +0200 Subject: [PATCH] change message infered type for closure --- compiler/rustc_typeck/src/check/demand.rs | 2 +- src/test/ui/closures/closure-return-type-mismatch.stderr | 2 +- src/test/ui/closures/issue-84128.stderr | 2 +- src/test/ui/generator/type-mismatch-signature-deduction.stderr | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/rustc_typeck/src/check/demand.rs b/compiler/rustc_typeck/src/check/demand.rs index e5fcdcfa74315..3affc10673439 100644 --- a/compiler/rustc_typeck/src/check/demand.rs +++ b/compiler/rustc_typeck/src/check/demand.rs @@ -1082,7 +1082,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { err.span_note( sp, &format!( - "return type inferred to be `{}` here", + "type inferred to be `{}` here", self.resolve_vars_if_possible(expected) ), ); diff --git a/src/test/ui/closures/closure-return-type-mismatch.stderr b/src/test/ui/closures/closure-return-type-mismatch.stderr index 3a89d30a05d20..a96efcd9e6da4 100644 --- a/src/test/ui/closures/closure-return-type-mismatch.stderr +++ b/src/test/ui/closures/closure-return-type-mismatch.stderr @@ -4,7 +4,7 @@ error[E0308]: mismatched types LL | a | ^ expected `&str`, found `bool` | -note: return type inferred to be `&str` here +note: type inferred to be `&str` here --> $DIR/closure-return-type-mismatch.rs:4:20 | LL | return "test"; diff --git a/src/test/ui/closures/issue-84128.stderr b/src/test/ui/closures/issue-84128.stderr index 70d9273ddf7ce..f1c0679aad531 100644 --- a/src/test/ui/closures/issue-84128.stderr +++ b/src/test/ui/closures/issue-84128.stderr @@ -4,7 +4,7 @@ error[E0308]: mismatched types LL | Foo(()) | ^^ expected integer, found `()` | -note: return type inferred to be `{integer}` here +note: type inferred to be `{integer}` here --> $DIR/issue-84128.rs:10:20 | LL | return Foo(0); diff --git a/src/test/ui/generator/type-mismatch-signature-deduction.stderr b/src/test/ui/generator/type-mismatch-signature-deduction.stderr index 3f1f33a3b123f..43a53b4bb44f9 100644 --- a/src/test/ui/generator/type-mismatch-signature-deduction.stderr +++ b/src/test/ui/generator/type-mismatch-signature-deduction.stderr @@ -6,7 +6,7 @@ LL | 5 | = note: expected type `Result<{integer}, _>` found type `{integer}` -note: return type inferred to be `Result<{integer}, _>` here +note: type inferred to be `Result<{integer}, _>` here --> $DIR/type-mismatch-signature-deduction.rs:8:20 | LL | return Ok(6);