diff options
| author | Esteban Küber <esteban@kuber.com.ar> | 2021-02-21 16:54:42 -0800 |
|---|---|---|
| committer | Esteban Küber <esteban@kuber.com.ar> | 2021-02-21 23:15:59 -0800 |
| commit | fc6c19e2dcbb3039a380755699669d317a6a3fb2 (patch) | |
| tree | 362b30d7348a947fab0c965eeb197fa2dd694999 | |
| parent | 86b3f3f2b39726e489df7f550c92f32515cee56b (diff) | |
| download | rust-fc6c19e2dcbb3039a380755699669d317a6a3fb2.tar.gz rust-fc6c19e2dcbb3039a380755699669d317a6a3fb2.zip | |
fix rebase
| -rw-r--r-- | compiler/rustc_hir/src/hir.rs | 3 | ||||
| -rw-r--r-- | src/test/ui/return/tail-expr-as-potential-return.stderr | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/compiler/rustc_hir/src/hir.rs b/compiler/rustc_hir/src/hir.rs index 84009984183..9b2077f0039 100644 --- a/compiler/rustc_hir/src/hir.rs +++ b/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 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); |