From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:03 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- .../ui/did_you_mean/compatible-variants.stderr | 221 --------------------- 1 file changed, 221 deletions(-) delete mode 100644 src/test/ui/did_you_mean/compatible-variants.stderr (limited to 'src/test/ui/did_you_mean/compatible-variants.stderr') diff --git a/src/test/ui/did_you_mean/compatible-variants.stderr b/src/test/ui/did_you_mean/compatible-variants.stderr deleted file mode 100644 index fe81da198..000000000 --- a/src/test/ui/did_you_mean/compatible-variants.stderr +++ /dev/null @@ -1,221 +0,0 @@ -error[E0308]: mismatched types - --> $DIR/compatible-variants.rs:13:5 - | -LL | fn a() -> Option<()> { - | ---------- expected `Option<()>` because of return type -LL | / while false { -LL | | -LL | | f(); -LL | | } - | |_____^ expected enum `Option`, found `()` - | - = note: expected enum `Option<()>` - found unit type `()` -help: try adding an expression at the end of the block - | -LL ~ } -LL + None - | -LL ~ } -LL + Some(()) - | - -error[E0308]: mismatched types - --> $DIR/compatible-variants.rs:21:5 - | -LL | fn b() -> Result<(), ()> { - | -------------- expected `Result<(), ()>` because of return type -LL | f() - | ^^^ expected enum `Result`, found `()` - | - = note: expected enum `Result<(), ()>` - found unit type `()` -help: try adding an expression at the end of the block - | -LL ~ f(); -LL + Ok(()) - | - -error[E0308]: mismatched types - --> $DIR/compatible-variants.rs:27:5 - | -LL | fn c() -> Option<()> { - | ---------- expected `Option<()>` because of return type -LL | / for _ in [1, 2] { -LL | | -LL | | f(); -LL | | } - | |_____^ expected enum `Option`, found `()` - | - = note: expected enum `Option<()>` - found unit type `()` -help: try adding an expression at the end of the block - | -LL ~ } -LL + None - | -LL ~ } -LL + Some(()) - | - -error[E0308]: `?` operator has incompatible types - --> $DIR/compatible-variants.rs:35:5 - | -LL | c()? - | ^^^^ expected enum `Option`, found `()` - | - = note: `?` operator cannot convert from `()` to `Option<()>` - = note: expected enum `Option<()>` - found unit type `()` -help: try removing this `?` - | -LL - c()? -LL + c() - | -help: try adding an expression at the end of the block - | -LL ~ c()?; -LL + None - | -LL ~ c()?; -LL + Some(()) - | - -error[E0308]: mismatched types - --> $DIR/compatible-variants.rs:42:25 - | -LL | let _: Option<()> = while false {}; - | ---------- ^^^^^^^^^^^^^^ expected enum `Option`, found `()` - | | - | expected due to this - | - = note: expected enum `Option<()>` - found unit type `()` -help: try wrapping the expression in `Some` - | -LL | let _: Option<()> = Some(while false {}); - | +++++ + - -error[E0308]: mismatched types - --> $DIR/compatible-variants.rs:46:9 - | -LL | while false {} - | ^^^^^^^^^^^^^^ expected enum `Option`, found `()` - | - = note: expected enum `Option<()>` - found unit type `()` -help: try adding an expression at the end of the block - | -LL ~ while false {} -LL + None - | -LL ~ while false {} -LL + Some(()) - | - -error[E0308]: mismatched types - --> $DIR/compatible-variants.rs:50:31 - | -LL | let _: Result = 1; - | ---------------- ^ expected enum `Result`, found integer - | | - | expected due to this - | - = note: expected enum `Result` - found type `{integer}` -help: try wrapping the expression in a variant of `Result` - | -LL | let _: Result = Ok(1); - | +++ + -LL | let _: Result = Err(1); - | ++++ + - -error[E0308]: mismatched types - --> $DIR/compatible-variants.rs:53:26 - | -LL | let _: Option = 1; - | ----------- ^ expected enum `Option`, found integer - | | - | expected due to this - | - = note: expected enum `Option` - found type `{integer}` -help: try wrapping the expression in `Some` - | -LL | let _: Option = Some(1); - | +++++ + - -error[E0308]: mismatched types - --> $DIR/compatible-variants.rs:56:28 - | -LL | let _: Hey = 1; - | ------------- ^ expected enum `Hey`, found integer - | | - | expected due to this - | - = note: expected enum `Hey` - found type `{integer}` -help: try wrapping the expression in a variant of `Hey` - | -LL | let _: Hey = Hey::A(1); - | +++++++ + -LL | let _: Hey = Hey::B(1); - | +++++++ + - -error[E0308]: mismatched types - --> $DIR/compatible-variants.rs:59:29 - | -LL | let _: Hey = false; - | -------------- ^^^^^ expected enum `Hey`, found `bool` - | | - | expected due to this - | - = note: expected enum `Hey` - found type `bool` -help: try wrapping the expression in `Hey::B` - | -LL | let _: Hey = Hey::B(false); - | +++++++ + - -error[E0308]: mismatched types - --> $DIR/compatible-variants.rs:63:19 - | -LL | let _ = Foo { bar }; - | ^^^ expected enum `Option`, found `i32` - | - = note: expected enum `Option` - found type `i32` -help: try wrapping the expression in `Some` - | -LL | let _ = Foo { bar: Some(bar) }; - | ++++++++++ + - -error[E0308]: mismatched types - --> $DIR/compatible-variants.rs:80:16 - | -LL | let a: A = B::Fst; - | - ^^^^^^ expected enum `A`, found enum `B` - | | - | expected due to this - | -help: try wrapping the expression in `A::B` - | -LL | let a: A = A::B { b: B::Fst }; - | +++++++++ + - -error[E0308]: mismatched types - --> $DIR/compatible-variants.rs:86:17 - | -LL | let a: A2 = B::Fst; - | -- ^^^^^^ expected struct `A2`, found enum `B` - | | - | expected due to this - | -help: try wrapping the expression in `A2` - | -LL | let a: A2 = A2(B::Fst); - | +++ + - -error: aborting due to 13 previous errors - -For more information about this error, try `rustc --explain E0308`. -- cgit v1.2.3