about summary refs log tree commit diff
path: root/src/test/ui
diff options
context:
space:
mode:
authorWilliam Bain <bain.william.a@gmail.com>2021-01-02 19:10:52 -0500
committerWilliam Bain <bain.william.a@gmail.com>2021-01-10 19:48:11 -0500
commitd46c3e3411b4971e31c9ead8126cc95114388b3b (patch)
treea1a167688697bcd9f678116b98cf1f70b1546836 /src/test/ui
parent62a39ed526e2d0a4d191903d4a9efc69c587335a (diff)
downloadrust-d46c3e3411b4971e31c9ead8126cc95114388b3b.tar.gz
rust-d46c3e3411b4971e31c9ead8126cc95114388b3b.zip
Tweak `?` inference error messages
Diffstat (limited to 'src/test/ui')
-rw-r--r--src/test/ui/inference/cannot-infer-async-enabled-impl-trait-bindings.stderr4
-rw-r--r--src/test/ui/inference/cannot-infer-async.stderr4
-rw-r--r--src/test/ui/inference/cannot-infer-closure.stderr4
-rw-r--r--src/test/ui/inference/cannot-infer-partial-try-return.stderr4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/test/ui/inference/cannot-infer-async-enabled-impl-trait-bindings.stderr b/src/test/ui/inference/cannot-infer-async-enabled-impl-trait-bindings.stderr
index de15d472d05..2875cef6801 100644
--- a/src/test/ui/inference/cannot-infer-async-enabled-impl-trait-bindings.stderr
+++ b/src/test/ui/inference/cannot-infer-async-enabled-impl-trait-bindings.stderr
@@ -13,9 +13,9 @@ error[E0282]: type annotations needed for `impl Future`
 LL |     let fut = async {
    |         --- consider giving `fut` the explicit type `impl Future`, with the type parameters specified
 LL |         make_unit()?;
-   |                    ^ cannot infer type of `?` error
+   |                    ^ cannot infer type of error for `?` operator
    |
-   = note: the `?` operation implicitly converts the error value into a type implementing `From<std::io::Error>`
+   = note: `?` implicitly converts the error value into a type implementing `From<std::io::Error>`
 
 error: aborting due to previous error; 1 warning emitted
 
diff --git a/src/test/ui/inference/cannot-infer-async.stderr b/src/test/ui/inference/cannot-infer-async.stderr
index d5cccc7a948..282bc13e9e7 100644
--- a/src/test/ui/inference/cannot-infer-async.stderr
+++ b/src/test/ui/inference/cannot-infer-async.stderr
@@ -4,9 +4,9 @@ error[E0282]: type annotations needed
 LL |     let fut = async {
    |         --- consider giving `fut` a type
 LL |         make_unit()?;
-   |                    ^ cannot infer type of `?` error
+   |                    ^ cannot infer type of error for `?` operator
    |
-   = note: the `?` operation implicitly converts the error value into a type implementing `From<std::io::Error>`
+   = note: `?` implicitly converts the error value into a type implementing `From<std::io::Error>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/inference/cannot-infer-closure.stderr b/src/test/ui/inference/cannot-infer-closure.stderr
index c083f2b686e..475ed00d107 100644
--- a/src/test/ui/inference/cannot-infer-closure.stderr
+++ b/src/test/ui/inference/cannot-infer-closure.stderr
@@ -2,9 +2,9 @@ error[E0282]: type annotations needed for the closure `fn((), ()) -> std::result
   --> $DIR/cannot-infer-closure.rs:3:15
    |
 LL |         Err(a)?;
-   |               ^ cannot infer type of `?` error
+   |               ^ cannot infer type of error for `?` operator
    |
-   = note: the `?` operation implicitly converts the error value into a type implementing `From<()>`
+   = note: `?` implicitly converts the error value into a type implementing `From<()>`
 help: give this closure an explicit return type without `_` placeholders
    |
 LL |     let x = |a: (), b: ()| -> std::result::Result<(), _> {
diff --git a/src/test/ui/inference/cannot-infer-partial-try-return.stderr b/src/test/ui/inference/cannot-infer-partial-try-return.stderr
index d4223bfc155..a64503fa667 100644
--- a/src/test/ui/inference/cannot-infer-partial-try-return.stderr
+++ b/src/test/ui/inference/cannot-infer-partial-try-return.stderr
@@ -2,9 +2,9 @@ error[E0282]: type annotations needed for the closure `fn() -> std::result::Resu
   --> $DIR/cannot-infer-partial-try-return.rs:19:9
    |
 LL |         infallible()?;
-   |         ^^^^^^^^^^^^^ cannot infer type of `?` error
+   |         ^^^^^^^^^^^^^ cannot infer type of error for `?` operator
    |
-   = note: the `?` operation implicitly converts the error value into `QualifiedError<_>` using its implementation of `From<Infallible>`
+   = note: `?` implicitly converts the error value into `QualifiedError<_>` using its implementation of `From<Infallible>`
 help: give this closure an explicit return type without `_` placeholders
    |
 LL |     let x = || -> std::result::Result<(), QualifiedError<_>> {