Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 41 deletions

diff --git a/src/test/ui/did_you_mean/compatible-variants-in-pat.rs b/src/test/ui/did_you_mean/compatible-variants-in-pat.rs
deleted file mode 100644
index 09e12dab2..000000000
--- a/src/test/ui/did_you_mean/compatible-variants-in-pat.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-enum Foo {
-    Bar(Bar),
-}
-struct Bar {
-    x: i32,
-}
-
-fn a(f: Foo) {
-    match f {
-        Bar { x } => {
-            //~^ ERROR mismatched types
-            //~| HELP try wrapping
-        }
-    }
-}
-
-struct S;
-
-fn b(s: Option<S>) {
-    match s {
-        S => {
-            //~^ ERROR mismatched types
-            //~| HELP try wrapping
-            //~| HELP introduce a new binding instead
-        }
-        _ => {}
-    }
-}
-
-fn c(s: Result<S, S>) {
-    match s {
-        S => {
-            //~^ ERROR mismatched types
-            //~| HELP try wrapping
-            //~| HELP introduce a new binding instead
-        }
-        _ => {}
-    }
-}
-
-fn main() {}