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/tuple/tuple-arity-mismatch.stderr b/tests/ui/tuple/tuple-arity-mismatch.stderr
new file mode 100644
index 000000000..fff7be987
--- /dev/null
+++ b/tests/ui/tuple/tuple-arity-mismatch.stderr
@@ -0,0 +1,35 @@
+error[E0308]: mismatched types
+  --> $DIR/tuple-arity-mismatch.rs:6:20
+   |
+LL |     let y = first ((1,2.0,3));
+   |             -----  ^^^^^^^^^ expected a tuple with 2 elements, found one with 3 elements
+   |             |
+   |             arguments to this function are incorrect
+   |
+   = note: expected tuple `(isize, f64)`
+              found tuple `(isize, f64, {integer})`
+note: function defined here
+  --> $DIR/tuple-arity-mismatch.rs:3:4
+   |
+LL | fn first((value, _): (isize, f64)) -> isize { value }
+   |    ^^^^^ ------------------------
+
+error[E0308]: mismatched types
+  --> $DIR/tuple-arity-mismatch.rs:12:20
+   |
+LL |     let y = first ((1,));
+   |             -----  ^^^^ expected a tuple with 2 elements, found one with 1 element
+   |             |
+   |             arguments to this function are incorrect
+   |
+   = note: expected tuple `(isize, f64)`
+              found tuple `(isize,)`
+note: function defined here
+  --> $DIR/tuple-arity-mismatch.rs:3:4
+   |
+LL | fn first((value, _): (isize, f64)) -> isize { value }
+   |    ^^^^^ ------------------------
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0308`.