Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 56 insertions, 0 deletions

diff --git a/tests/ui/or-patterns/multiple-pattern-typo.stderr b/tests/ui/or-patterns/multiple-pattern-typo.stderr
new file mode 100644
index 000000000..b0a82b367
--- /dev/null
+++ b/tests/ui/or-patterns/multiple-pattern-typo.stderr
@@ -0,0 +1,56 @@
+error: unexpected token `||` in pattern
+  --> $DIR/multiple-pattern-typo.rs:7:15
+   |
+LL |         1 | 2 || 3 => (),
+   |         -     ^^ help: use a single `|` to separate multiple alternative patterns: `|`
+   |         |
+   |         while parsing this or-pattern starting here
+
+error: unexpected token `||` in pattern
+  --> $DIR/multiple-pattern-typo.rs:12:16
+   |
+LL |         (1 | 2 || 3) => (),
+   |          -     ^^ help: use a single `|` to separate multiple alternative patterns: `|`
+   |          |
+   |          while parsing this or-pattern starting here
+
+error: unexpected token `||` in pattern
+  --> $DIR/multiple-pattern-typo.rs:17:16
+   |
+LL |         (1 | 2 || 3,) => (),
+   |          -     ^^ help: use a single `|` to separate multiple alternative patterns: `|`
+   |          |
+   |          while parsing this or-pattern starting here
+
+error: unexpected token `||` in pattern
+  --> $DIR/multiple-pattern-typo.rs:24:18
+   |
+LL |         TS(1 | 2 || 3) => (),
+   |            -     ^^ help: use a single `|` to separate multiple alternative patterns: `|`
+   |            |
+   |            while parsing this or-pattern starting here
+
+error: unexpected token `||` in pattern
+  --> $DIR/multiple-pattern-typo.rs:31:23
+   |
+LL |         NS { f: 1 | 2 || 3 } => (),
+   |                 -     ^^ help: use a single `|` to separate multiple alternative patterns: `|`
+   |                 |
+   |                 while parsing this or-pattern starting here
+
+error: unexpected token `||` in pattern
+  --> $DIR/multiple-pattern-typo.rs:36:16
+   |
+LL |         [1 | 2 || 3] => (),
+   |          -     ^^ help: use a single `|` to separate multiple alternative patterns: `|`
+   |          |
+   |          while parsing this or-pattern starting here
+
+error: unexpected token `||` in pattern
+  --> $DIR/multiple-pattern-typo.rs:41:9
+   |
+LL |         || 1 | 2 | 3 => (),
+   |         ^^ help: use a single `|` to separate multiple alternative patterns: `|`
+
+error: aborting due to 7 previous errors
+