Merging upstream version 1.68.2+dfsg1.

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

22 files changed, 0 insertions, 319 deletions

diff --git a/src/test/ui/duplicate/dupe-symbols-1.rs b/src/test/ui/duplicate/dupe-symbols-1.rs
deleted file mode 100644
index 28e329b56..000000000
--- a/src/test/ui/duplicate/dupe-symbols-1.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// build-fail
-
-//
-#![crate_type="rlib"]
-#![allow(warnings)]
-
-#[export_name="fail"]
-pub fn a() {
-}
-
-#[export_name="fail"]
-pub fn b() {
-//~^ symbol `fail` is already defined
-}
diff --git a/src/test/ui/duplicate/dupe-symbols-1.stderr b/src/test/ui/duplicate/dupe-symbols-1.stderr
deleted file mode 100644
index 933ed5e89..000000000
--- a/src/test/ui/duplicate/dupe-symbols-1.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: symbol `fail` is already defined
-  --> $DIR/dupe-symbols-1.rs:12:1
-   |
-LL | pub fn b() {
-   | ^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/duplicate/dupe-symbols-2.rs b/src/test/ui/duplicate/dupe-symbols-2.rs
deleted file mode 100644
index e303a790b..000000000
--- a/src/test/ui/duplicate/dupe-symbols-2.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// build-fail
-
-//
-#![crate_type="rlib"]
-#![allow(warnings)]
-
-pub mod a {
-    #[no_mangle]
-    pub extern "C" fn fail() {
-    }
-}
-
-pub mod b {
-    #[no_mangle]
-    pub extern "C" fn fail() {
-    //~^ symbol `fail` is already defined
-    }
-}
diff --git a/src/test/ui/duplicate/dupe-symbols-2.stderr b/src/test/ui/duplicate/dupe-symbols-2.stderr
deleted file mode 100644
index b132eae4b..000000000
--- a/src/test/ui/duplicate/dupe-symbols-2.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: symbol `fail` is already defined
-  --> $DIR/dupe-symbols-2.rs:15:5
-   |
-LL |     pub extern "C" fn fail() {
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/duplicate/dupe-symbols-3.rs b/src/test/ui/duplicate/dupe-symbols-3.rs
deleted file mode 100644
index 1af2fe98e..000000000
--- a/src/test/ui/duplicate/dupe-symbols-3.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// build-fail
-
-//
-#![crate_type="rlib"]
-#![allow(warnings)]
-
-#[export_name="fail"]
-pub fn a() {
-}
-
-#[no_mangle]
-pub fn fail() {
-//~^ symbol `fail` is already defined
-}
diff --git a/src/test/ui/duplicate/dupe-symbols-3.stderr b/src/test/ui/duplicate/dupe-symbols-3.stderr
deleted file mode 100644
index 6300b4908..000000000
--- a/src/test/ui/duplicate/dupe-symbols-3.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: symbol `fail` is already defined
-  --> $DIR/dupe-symbols-3.rs:12:1
-   |
-LL | pub fn fail() {
-   | ^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/duplicate/dupe-symbols-4.rs b/src/test/ui/duplicate/dupe-symbols-4.rs
deleted file mode 100644
index de6610c3e..000000000
--- a/src/test/ui/duplicate/dupe-symbols-4.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// build-fail
-
-//
-// error-pattern: symbol `fail` is already defined
-#![crate_type="rlib"]
-#![allow(warnings)]
-
-
-pub trait A {
-    fn fail(self);
-}
-
-struct B;
-struct C;
-
-impl A for B {
-    #[no_mangle]
-    fn fail(self) {}
-}
-
-impl A for C {
-    #[no_mangle]
-    fn fail(self) {}
-}
diff --git a/src/test/ui/duplicate/dupe-symbols-4.stderr b/src/test/ui/duplicate/dupe-symbols-4.stderr
deleted file mode 100644
index 1407a4883..000000000
--- a/src/test/ui/duplicate/dupe-symbols-4.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: symbol `fail` is already defined
-  --> $DIR/dupe-symbols-4.rs:23:5
-   |
-LL |     fn fail(self) {}
-   |     ^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/duplicate/dupe-symbols-5.rs b/src/test/ui/duplicate/dupe-symbols-5.rs
deleted file mode 100644
index ea801cef6..000000000
--- a/src/test/ui/duplicate/dupe-symbols-5.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// build-fail
-
-//
-#![crate_type="rlib"]
-#![allow(warnings)]
-
-#[export_name="fail"]
-static HELLO: u8 = 0;
-
-#[export_name="fail"]
-pub fn b() {
-//~^ symbol `fail` is already defined
-}
diff --git a/src/test/ui/duplicate/dupe-symbols-5.stderr b/src/test/ui/duplicate/dupe-symbols-5.stderr
deleted file mode 100644
index 558f868a0..000000000
--- a/src/test/ui/duplicate/dupe-symbols-5.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: symbol `fail` is already defined
-  --> $DIR/dupe-symbols-5.rs:11:1
-   |
-LL | pub fn b() {
-   | ^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/duplicate/dupe-symbols-6.rs b/src/test/ui/duplicate/dupe-symbols-6.rs
deleted file mode 100644
index 018f4bb7f..000000000
--- a/src/test/ui/duplicate/dupe-symbols-6.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// build-fail
-
-#![crate_type="rlib"]
-#![allow(warnings)]
-
-#[export_name="fail"]
-static HELLO: u8 = 0;
-
-#[export_name="fail"]
-static HELLO_TWICE: u16 = 0;
-//~^ symbol `fail` is already defined
diff --git a/src/test/ui/duplicate/dupe-symbols-6.stderr b/src/test/ui/duplicate/dupe-symbols-6.stderr
deleted file mode 100644
index 6692a63dc..000000000
--- a/src/test/ui/duplicate/dupe-symbols-6.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: symbol `fail` is already defined
-  --> $DIR/dupe-symbols-6.rs:10:1
-   |
-LL | static HELLO_TWICE: u16 = 0;
-   | ^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/duplicate/dupe-symbols-7.rs b/src/test/ui/duplicate/dupe-symbols-7.rs
deleted file mode 100644
index 633ca4c31..000000000
--- a/src/test/ui/duplicate/dupe-symbols-7.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// build-fail
-
-//
-// error-pattern: entry symbol `main` declared multiple times
-
-// FIXME https://github.com/rust-lang/rust/issues/59774
-// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
-// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
-#![allow(warnings)]
-
-#[no_mangle]
-fn main(){}
diff --git a/src/test/ui/duplicate/dupe-symbols-7.stderr b/src/test/ui/duplicate/dupe-symbols-7.stderr
deleted file mode 100644
index 1455f0e75..000000000
--- a/src/test/ui/duplicate/dupe-symbols-7.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: entry symbol `main` declared multiple times
-  --> $DIR/dupe-symbols-7.rs:12:1
-   |
-LL | fn main(){}
-   | ^^^^^^^^^
-   |
-   = help: did you use `#[no_mangle]` on `fn main`? Use `#[start]` instead
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/duplicate/dupe-symbols-8.rs b/src/test/ui/duplicate/dupe-symbols-8.rs
deleted file mode 100644
index ce7fa24a9..000000000
--- a/src/test/ui/duplicate/dupe-symbols-8.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// build-fail
-// error-pattern: entry symbol `main` declared multiple times
-//
-// See #67946.
-
-#![allow(warnings)]
-fn main() {
-    extern "Rust" {
-     fn main();
-    }
-    unsafe { main(); }
-}
diff --git a/src/test/ui/duplicate/dupe-symbols-8.stderr b/src/test/ui/duplicate/dupe-symbols-8.stderr
deleted file mode 100644
index 8d6a79e12..000000000
--- a/src/test/ui/duplicate/dupe-symbols-8.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: entry symbol `main` declared multiple times
-  --> $DIR/dupe-symbols-8.rs:7:1
-   |
-LL | fn main() {
-   | ^^^^^^^^^
-   |
-   = help: did you use `#[no_mangle]` on `fn main`? Use `#[start]` instead
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/duplicate/duplicate-check-macro-exports.rs b/src/test/ui/duplicate/duplicate-check-macro-exports.rs
deleted file mode 100644
index 9ba28acfd..000000000
--- a/src/test/ui/duplicate/duplicate-check-macro-exports.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub use std::panic;
-
-#[macro_export]
-macro_rules! panic { () => {} } //~ ERROR the name `panic` is defined multiple times
-
-fn main() {}
diff --git a/src/test/ui/duplicate/duplicate-check-macro-exports.stderr b/src/test/ui/duplicate/duplicate-check-macro-exports.stderr
deleted file mode 100644
index ba723b38b..000000000
--- a/src/test/ui/duplicate/duplicate-check-macro-exports.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0255]: the name `panic` is defined multiple times
-  --> $DIR/duplicate-check-macro-exports.rs:4:1
-   |
-LL | pub use std::panic;
-   |         ---------- previous import of the macro `panic` here
-...
-LL | macro_rules! panic { () => {} }
-   | ^^^^^^^^^^^^^^^^^^ `panic` redefined here
-   |
-   = note: `panic` must be defined only once in the macro namespace of this module
-help: you can use `as` to change the binding name of the import
-   |
-LL | pub use std::panic as other_panic;
-   |         ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0255`.
diff --git a/src/test/ui/duplicate/duplicate-parameter.rs b/src/test/ui/duplicate/duplicate-parameter.rs
deleted file mode 100644
index e5b21bbcd..000000000
--- a/src/test/ui/duplicate/duplicate-parameter.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-fn f(a: isize, a: isize) {}
-//~^ ERROR identifier `a` is bound more than once in this parameter list
-
-fn main() {
-}
diff --git a/src/test/ui/duplicate/duplicate-parameter.stderr b/src/test/ui/duplicate/duplicate-parameter.stderr
deleted file mode 100644
index f3ef0bcf3..000000000
--- a/src/test/ui/duplicate/duplicate-parameter.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0415]: identifier `a` is bound more than once in this parameter list
-  --> $DIR/duplicate-parameter.rs:1:16
-   |
-LL | fn f(a: isize, a: isize) {}
-   |                ^ used as parameter more than once
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0415`.
diff --git a/src/test/ui/duplicate/duplicate-type-parameter.rs b/src/test/ui/duplicate/duplicate-type-parameter.rs
deleted file mode 100644
index 2751b3c8d..000000000
--- a/src/test/ui/duplicate/duplicate-type-parameter.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-type Foo<T,T> = Option<T>;
-//~^ ERROR the name `T` is already used
-
-struct Bar<T,T>(T);
-//~^ ERROR the name `T` is already used
-
-struct Baz<T,T> {
-//~^ ERROR the name `T` is already used
-    x: T,
-}
-
-enum Boo<T,T> {
-//~^ ERROR the name `T` is already used
-    A(T),
-    B,
-}
-
-fn quux<T,T>(x: T) {}
-//~^ ERROR the name `T` is already used
-
-trait Qux<T,T> {}
-//~^ ERROR the name `T` is already used
-
-impl<T,T> Qux<T,T> for Option<T> {}
-//~^ ERROR the name `T` is already used
-//~^^ ERROR the type parameter `T` is not constrained
-
-fn main() {
-}
diff --git a/src/test/ui/duplicate/duplicate-type-parameter.stderr b/src/test/ui/duplicate/duplicate-type-parameter.stderr
deleted file mode 100644
index 628f898d5..000000000
--- a/src/test/ui/duplicate/duplicate-type-parameter.stderr
+++ /dev/null
@@ -1,66 +0,0 @@
-error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters
-  --> $DIR/duplicate-type-parameter.rs:1:12
-   |
-LL | type Foo<T,T> = Option<T>;
-   |          - ^ already used
-   |          |
-   |          first use of `T`
-
-error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters
-  --> $DIR/duplicate-type-parameter.rs:4:14
-   |
-LL | struct Bar<T,T>(T);
-   |            - ^ already used
-   |            |
-   |            first use of `T`
-
-error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters
-  --> $DIR/duplicate-type-parameter.rs:7:14
-   |
-LL | struct Baz<T,T> {
-   |            - ^ already used
-   |            |
-   |            first use of `T`
-
-error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters
-  --> $DIR/duplicate-type-parameter.rs:12:12
-   |
-LL | enum Boo<T,T> {
-   |          - ^ already used
-   |          |
-   |          first use of `T`
-
-error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters
-  --> $DIR/duplicate-type-parameter.rs:18:11
-   |
-LL | fn quux<T,T>(x: T) {}
-   |         - ^ already used
-   |         |
-   |         first use of `T`
-
-error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters
-  --> $DIR/duplicate-type-parameter.rs:21:13
-   |
-LL | trait Qux<T,T> {}
-   |           - ^ already used
-   |           |
-   |           first use of `T`
-
-error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters
-  --> $DIR/duplicate-type-parameter.rs:24:8
-   |
-LL | impl<T,T> Qux<T,T> for Option<T> {}
-   |      - ^ already used
-   |      |
-   |      first use of `T`
-
-error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates
-  --> $DIR/duplicate-type-parameter.rs:24:8
-   |
-LL | impl<T,T> Qux<T,T> for Option<T> {}
-   |        ^ unconstrained type parameter
-
-error: aborting due to 8 previous errors
-
-Some errors have detailed explanations: E0207, E0403.
-For more information about an error, try `rustc --explain E0207`.