Merging upstream version 1.68.2+dfsg1.

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

6 files changed, 0 insertions, 112 deletions

diff --git a/src/test/ui/tuple/tuple-struct-fields/test.rs b/src/test/ui/tuple/tuple-struct-fields/test.rs
deleted file mode 100644
index 00677090d..000000000
--- a/src/test/ui/tuple/tuple-struct-fields/test.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-mod foo {
-    type T = ();
-    struct S1(pub(in foo) (), pub(T), pub(crate) (), pub(((), T)));
-    struct S2(pub((foo)) ());
-    //~^ ERROR expected one of `)` or `,`, found `(`
-    //~| ERROR cannot find type `foo` in this scope
-}
-
-fn main() {}
diff --git a/src/test/ui/tuple/tuple-struct-fields/test.stderr b/src/test/ui/tuple/tuple-struct-fields/test.stderr
deleted file mode 100644
index bfa0b32fd..000000000
--- a/src/test/ui/tuple/tuple-struct-fields/test.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error: expected one of `)` or `,`, found `(`
-  --> $DIR/test.rs:4:26
-   |
-LL |     struct S2(pub((foo)) ());
-   |                         -^ expected one of `)` or `,`
-   |                         |
-   |                         help: missing `,`
-
-error[E0412]: cannot find type `foo` in this scope
-  --> $DIR/test.rs:4:20
-   |
-LL |     struct S2(pub((foo)) ());
-   |                    ^^^ not found in this scope
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/tuple/tuple-struct-fields/test2.rs b/src/test/ui/tuple/tuple-struct-fields/test2.rs
deleted file mode 100644
index 2b2a2c127..000000000
--- a/src/test/ui/tuple/tuple-struct-fields/test2.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-macro_rules! define_struct {
-    ($t:ty) => {
-        struct S1(pub $t);
-        struct S2(pub (in foo) ());
-        struct S3(pub $t ());
-        //~^ ERROR expected one of `)` or `,`, found `(`
-    }
-}
-
-mod foo {
-    define_struct! { (foo) } //~ ERROR cannot find type `foo` in this scope
-                             //~| ERROR cannot find type `foo` in this scope
-}
-
-fn main() {}
diff --git a/src/test/ui/tuple/tuple-struct-fields/test2.stderr b/src/test/ui/tuple/tuple-struct-fields/test2.stderr
deleted file mode 100644
index 64a9ac135..000000000
--- a/src/test/ui/tuple/tuple-struct-fields/test2.stderr
+++ /dev/null
@@ -1,28 +0,0 @@
-error: expected one of `)` or `,`, found `(`
-  --> $DIR/test2.rs:5:26
-   |
-LL |         struct S3(pub $t ());
-   |                         -^ expected one of `)` or `,`
-   |                         |
-   |                         help: missing `,`
-...
-LL |     define_struct! { (foo) }
-   |     ------------------------ in this macro invocation
-   |
-   = note: this error originates in the macro `define_struct` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0412]: cannot find type `foo` in this scope
-  --> $DIR/test2.rs:11:23
-   |
-LL |     define_struct! { (foo) }
-   |                       ^^^ not found in this scope
-
-error[E0412]: cannot find type `foo` in this scope
-  --> $DIR/test2.rs:11:23
-   |
-LL |     define_struct! { (foo) }
-   |                       ^^^ not found in this scope
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/tuple/tuple-struct-fields/test3.rs b/src/test/ui/tuple/tuple-struct-fields/test3.rs
deleted file mode 100644
index 98d19426e..000000000
--- a/src/test/ui/tuple/tuple-struct-fields/test3.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-macro_rules! define_struct {
-    ($t:ty) => {
-        struct S1(pub($t));
-        struct S2(pub (in foo) ());
-        struct S3(pub($t) ());
-        //~^ ERROR expected one of `)` or `,`, found `(`
-    }
-}
-
-mod foo {
-    define_struct! { foo } //~ ERROR cannot find type `foo` in this scope
-                           //~| ERROR cannot find type `foo` in this scope
-}
-
-fn main() {}
diff --git a/src/test/ui/tuple/tuple-struct-fields/test3.stderr b/src/test/ui/tuple/tuple-struct-fields/test3.stderr
deleted file mode 100644
index 75262ed57..000000000
--- a/src/test/ui/tuple/tuple-struct-fields/test3.stderr
+++ /dev/null
@@ -1,28 +0,0 @@
-error: expected one of `)` or `,`, found `(`
-  --> $DIR/test3.rs:5:27
-   |
-LL |         struct S3(pub($t) ());
-   |                          -^ expected one of `)` or `,`
-   |                          |
-   |                          help: missing `,`
-...
-LL |     define_struct! { foo }
-   |     ---------------------- in this macro invocation
-   |
-   = note: this error originates in the macro `define_struct` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0412]: cannot find type `foo` in this scope
-  --> $DIR/test3.rs:11:22
-   |
-LL |     define_struct! { foo }
-   |                      ^^^ not found in this scope
-
-error[E0412]: cannot find type `foo` in this scope
-  --> $DIR/test3.rs:11:22
-   |
-LL |     define_struct! { foo }
-   |                      ^^^ not found in this scope
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0412`.