fix rebase

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);