Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 35 insertions, 0 deletions

diff --git a/tests/ui/pattern/pattern-error-continue.rs b/tests/ui/pattern/pattern-error-continue.rs
new file mode 100644
index 000000000..0702a9986
--- /dev/null
+++ b/tests/ui/pattern/pattern-error-continue.rs
@@ -0,0 +1,35 @@
+// Test that certain pattern-match type errors are non-fatal
+
+enum A {
+    B(isize, isize),
+    C(isize, isize, isize),
+    D
+}
+
+struct S {
+    a: isize
+}
+
+fn f(_c: char) {}
+
+fn main() {
+    match A::B(1, 2) {
+        A::B(_, _, _) => (), //~ ERROR this pattern has 3 fields, but
+        A::D(_) => (), //~ ERROR expected tuple struct or tuple variant, found unit variant `A::D`
+        _ => ()
+    }
+    match 'c' {
+        S { .. } => (),
+        //~^ ERROR mismatched types
+        //~| expected `char`, found struct `S`
+
+        _ => ()
+    }
+    f(true);
+    //~^ ERROR mismatched types
+    //~| expected `char`, found `bool`
+
+    match () {
+        E::V => {} //~ ERROR failed to resolve: use of undeclared type `E`
+    }
+}