Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 76 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-5100.stderr b/tests/ui/issues/issue-5100.stderr
new file mode 100644
index 000000000..c87a3e348
--- /dev/null
+++ b/tests/ui/issues/issue-5100.stderr
@@ -0,0 +1,76 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-5100.rs:8:9
+   |
+LL | enum A { B, C }
+   |          - unit variant defined here
+...
+LL |     match (true, false) {
+   |           ------------- this expression has type `(bool, bool)`
+LL |         A::B => (),
+   |         ^^^^ expected tuple, found enum `A`
+   |
+   = note: expected tuple `(bool, bool)`
+               found enum `A`
+
+error[E0308]: mismatched types
+  --> $DIR/issue-5100.rs:17:9
+   |
+LL |     match (true, false) {
+   |           ------------- this expression has type `(bool, bool)`
+LL |         (true, false, false) => ()
+   |         ^^^^^^^^^^^^^^^^^^^^ expected a tuple with 2 elements, found one with 3 elements
+   |
+   = note: expected tuple `(bool, bool)`
+              found tuple `(_, _, _)`
+
+error[E0308]: mismatched types
+  --> $DIR/issue-5100.rs:25:9
+   |
+LL |     match (true, false) {
+   |           ------------- this expression has type `(bool, bool)`
+LL |         (true, false, false) => ()
+   |         ^^^^^^^^^^^^^^^^^^^^ expected a tuple with 2 elements, found one with 3 elements
+   |
+   = note: expected tuple `(bool, bool)`
+              found tuple `(_, _, _)`
+
+error[E0308]: mismatched types
+  --> $DIR/issue-5100.rs:33:9
+   |
+LL |     match (true, false) {
+   |           ------------- this expression has type `(bool, bool)`
+LL |         box (true, false) => ()
+   |         ^^^^^^^^^^^^^^^^^ expected tuple, found struct `Box`
+   |
+   = note: expected tuple `(bool, bool)`
+             found struct `Box<_>`
+
+error[E0308]: mismatched types
+  --> $DIR/issue-5100.rs:40:9
+   |
+LL |     match (true, false) {
+   |           ------------- this expression has type `(bool, bool)`
+LL |         &(true, false) => ()
+   |         ^^^^^^^^^^^^^^ expected tuple, found reference
+   |
+   = note:  expected tuple `(bool, bool)`
+           found reference `&_`
+
+error[E0618]: expected function, found `(char, char)`
+  --> $DIR/issue-5100.rs:48:14
+   |
+LL |     let v = [('a', 'b')
+   |              ^^^^^^^^^^- help: consider separating array elements with a comma: `,`
+
+error[E0308]: mismatched types
+  --> $DIR/issue-5100.rs:55:19
+   |
+LL |     let x: char = true;
+   |            ----   ^^^^ expected `char`, found `bool`
+   |            |
+   |            expected due to this
+
+error: aborting due to 7 previous errors
+
+Some errors have detailed explanations: E0308, E0618.
+For more information about an error, try `rustc --explain E0308`.