Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 45 insertions, 0 deletions

diff --git a/tests/ui/generics/generic-arg-mismatch-recover.stderr b/tests/ui/generics/generic-arg-mismatch-recover.stderr
new file mode 100644
index 000000000..45fea925f
--- /dev/null
+++ b/tests/ui/generics/generic-arg-mismatch-recover.stderr
@@ -0,0 +1,45 @@
+error[E0107]: this struct takes 1 lifetime argument but 2 lifetime arguments were supplied
+  --> $DIR/generic-arg-mismatch-recover.rs:6:5
+   |
+LL |     Foo::<'static, 'static, ()>(&0);
+   |     ^^^            ------- help: remove this lifetime argument
+   |     |
+   |     expected 1 lifetime argument
+   |
+note: struct defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/generic-arg-mismatch-recover.rs:1:8
+   |
+LL | struct Foo<'a, T: 'a>(&'a T);
+   |        ^^^ --
+
+error[E0107]: this struct takes 1 lifetime argument but 2 lifetime arguments were supplied
+  --> $DIR/generic-arg-mismatch-recover.rs:9:5
+   |
+LL |     Bar::<'static, 'static, ()>(&());
+   |     ^^^            ------- help: remove this lifetime argument
+   |     |
+   |     expected 1 lifetime argument
+   |
+note: struct defined here, with 1 lifetime parameter: `'a`
+  --> $DIR/generic-arg-mismatch-recover.rs:3:8
+   |
+LL | struct Bar<'a>(&'a ());
+   |        ^^^ --
+
+error[E0107]: this struct takes 0 generic arguments but 1 generic argument was supplied
+  --> $DIR/generic-arg-mismatch-recover.rs:9:5
+   |
+LL |     Bar::<'static, 'static, ()>(&());
+   |     ^^^                     -- help: remove this generic argument
+   |     |
+   |     expected 0 generic arguments
+   |
+note: struct defined here, with 0 generic parameters
+  --> $DIR/generic-arg-mismatch-recover.rs:3:8
+   |
+LL | struct Bar<'a>(&'a ());
+   |        ^^^
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0107`.