diff options
| -rw-r--r-- | src/test/ui/return/tail-expr-as-potential-return.rs | 22 | ||||
| -rw-r--r-- | src/test/ui/return/tail-expr-as-potential-return.stderr | 22 |
2 files changed, 42 insertions, 2 deletions
diff --git a/src/test/ui/return/tail-expr-as-potential-return.rs b/src/test/ui/return/tail-expr-as-potential-return.rs index 83266abfa06..2c3610fb24d 100644 --- a/src/test/ui/return/tail-expr-as-potential-return.rs +++ b/src/test/ui/return/tail-expr-as-potential-return.rs @@ -1,3 +1,16 @@ +// > Suggest `return`ing tail expressions that match return type +// > +// > Some newcomers are confused by the behavior of tail expressions, +// > interpreting that "leaving out the `;` makes it the return value". +// > To help them go in the right direction, suggest using `return` instead +// > when applicable. +// (original commit description for this test) +// +// This test was amended to also serve as a regression test for #92308, where +// this suggestion would not trigger with async functions. +// +// edition:2018 + fn main() { let _ = foo(true); } @@ -5,6 +18,15 @@ fn main() { fn foo(x: bool) -> Result<f64, i32> { if x { Err(42) //~ ERROR mismatched types + //| HELP you might have meant to return this value + } + Ok(42.0) +} + +async fn bar(x: bool) -> Result<f64, i32> { + if x { + Err(42) //~ ERROR mismatched types + //| HELP you might have meant to return this value } Ok(42.0) } 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 87ef18878d6..dec1cbc4624 100644 --- a/src/test/ui/return/tail-expr-as-potential-return.stderr +++ b/src/test/ui/return/tail-expr-as-potential-return.stderr @@ -1,9 +1,10 @@ error[E0308]: mismatched types - --> $DIR/tail-expr-as-potential-return.rs:7:9 + --> $DIR/tail-expr-as-potential-return.rs:28:9 | LL | / if x { LL | | Err(42) | | ^^^^^^^ expected `()`, found enum `Result` +LL | | //| HELP you might have meant to return this value LL | | } | |_____- expected this to be `()` | @@ -14,6 +15,23 @@ help: you might have meant to return this value LL | return Err(42); | ++++++ + -error: aborting due to previous error +error[E0308]: mismatched types + --> $DIR/tail-expr-as-potential-return.rs:20:9 + | +LL | / if x { +LL | | Err(42) + | | ^^^^^^^ expected `()`, found enum `Result` +LL | | //| HELP you might have meant to return this value +LL | | } + | |_____- expected this to be `()` + | + = note: expected unit type `()` + found enum `Result<_, {integer}>` +help: you might have meant to return this value + | +LL | return Err(42); + | ++++++ + + +error: aborting due to 2 previous errors For more information about this error, try `rustc --explain E0308`. |