fix rebase

Author: estebank

compiler/rustc_hir/src/hir.rs

@@ -1,5 +1,4 @@
 // ignore-tidy-filelength
-use crate::def::{DefKind, Namespace, Res};
 use crate::def::{CtorKind, DefKind, Namespace, Res};
 use crate::def_id::DefId;
 crate use crate::hir_id::HirId;
@@ -1562,7 +1561,7 @@ impl Expr<'_> {
             ExprKind::Type(base, _)
             | ExprKind::Unary(_, base)
             | ExprKind::Field(base, _)
-            | ExprKind::Index(base, _) 
+            | ExprKind::Index(base, _)
             | ExprKind::AddrOf(.., base)
             | ExprKind::Cast(base, _) => {
                 // This isn't exactly true for `Index` and all `Unnary`, but we are using this

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