Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 67 insertions, 0 deletions

diff --git a/tests/ui/constructor-lifetime-args.stderr b/tests/ui/constructor-lifetime-args.stderr
new file mode 100644
index 000000000..bc1141b16
--- /dev/null
+++ b/tests/ui/constructor-lifetime-args.stderr
@@ -0,0 +1,67 @@
+error[E0107]: this struct takes 2 lifetime arguments but 1 lifetime argument was supplied
+  --> $DIR/constructor-lifetime-args.rs:17:5
+   |
+LL |     S::<'static>(&0, &0);
+   |     ^   ------- supplied 1 lifetime argument
+   |     |
+   |     expected 2 lifetime arguments
+   |
+note: struct defined here, with 2 lifetime parameters: `'a`, `'b`
+  --> $DIR/constructor-lifetime-args.rs:9:8
+   |
+LL | struct S<'a, 'b>(&'a u8, &'b u8);
+   |        ^ --  --
+help: add missing lifetime argument
+   |
+LL |     S::<'static, 'static>(&0, &0);
+   |                +++++++++
+
+error[E0107]: this struct takes 2 lifetime arguments but 3 lifetime arguments were supplied
+  --> $DIR/constructor-lifetime-args.rs:19:5
+   |
+LL |     S::<'static, 'static, 'static>(&0, &0);
+   |     ^                     ------- help: remove this lifetime argument
+   |     |
+   |     expected 2 lifetime arguments
+   |
+note: struct defined here, with 2 lifetime parameters: `'a`, `'b`
+  --> $DIR/constructor-lifetime-args.rs:9:8
+   |
+LL | struct S<'a, 'b>(&'a u8, &'b u8);
+   |        ^ --  --
+
+error[E0107]: this enum takes 2 lifetime arguments but 1 lifetime argument was supplied
+  --> $DIR/constructor-lifetime-args.rs:22:8
+   |
+LL |     E::V::<'static>(&0);
+   |        ^   ------- supplied 1 lifetime argument
+   |        |
+   |        expected 2 lifetime arguments
+   |
+note: enum defined here, with 2 lifetime parameters: `'a`, `'b`
+  --> $DIR/constructor-lifetime-args.rs:10:6
+   |
+LL | enum E<'a, 'b> {
+   |      ^ --  --
+help: add missing lifetime argument
+   |
+LL |     E::V::<'static, 'static>(&0);
+   |                   +++++++++
+
+error[E0107]: this enum takes 2 lifetime arguments but 3 lifetime arguments were supplied
+  --> $DIR/constructor-lifetime-args.rs:24:8
+   |
+LL |     E::V::<'static, 'static, 'static>(&0);
+   |        ^                     ------- help: remove this lifetime argument
+   |        |
+   |        expected 2 lifetime arguments
+   |
+note: enum defined here, with 2 lifetime parameters: `'a`, `'b`
+  --> $DIR/constructor-lifetime-args.rs:10:6
+   |
+LL | enum E<'a, 'b> {
+   |      ^ --  --
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0107`.