about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2021-02-21 16:54:42 -0800
committerEsteban Küber <esteban@kuber.com.ar>2021-02-21 23:15:59 -0800
commitfc6c19e2dcbb3039a380755699669d317a6a3fb2 (patch)
tree362b30d7348a947fab0c965eeb197fa2dd694999 /src
parent86b3f3f2b39726e489df7f550c92f32515cee56b (diff)
downloadrust-fc6c19e2dcbb3039a380755699669d317a6a3fb2.tar.gz
rust-fc6c19e2dcbb3039a380755699669d317a6a3fb2.zip
fix rebase
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/return/tail-expr-as-potential-return.stderr4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/return/tail-expr-as-potential-return.stderr b/src/test/ui/return/tail-expr-as-potential-return.stderr
index 52c63c8e223..f8527961374 100644
--- a/src/test/ui/return/tail-expr-as-potential-return.stderr
+++ b/src/test/ui/return/tail-expr-as-potential-return.stderr
@@ -3,12 +3,12 @@ error[E0308]: mismatched types
    |
 LL | /     if x {
 LL | |         Err(42)
-   | |         ^^^^^^^ expected `()`, found enum `std::result::Result`
+   | |         ^^^^^^^ expected `()`, found enum `Result`
 LL | |     }
    | |_____- expected this to be `()`
    |
    = note: expected unit type `()`
-                   found enum `std::result::Result<_, {integer}>`
+                   found enum `Result<_, {integer}>`
 help: you might have meant to return this value
    |
 LL |         return Err(42);