Merging upstream version 1.68.2+dfsg1.

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

22 files changed, 0 insertions, 161 deletions

diff --git a/src/test/ui/native-library-link-flags/empty-kind-1.rs b/src/test/ui/native-library-link-flags/empty-kind-1.rs
deleted file mode 100644
index 18937856d..000000000
--- a/src/test/ui/native-library-link-flags/empty-kind-1.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// Unspecified kind should fail with an error
-
-// compile-flags: -l =mylib
-// error-pattern: unknown library kind ``, expected one of: static, dylib, framework, link-arg
-
-fn main() {}
diff --git a/src/test/ui/native-library-link-flags/empty-kind-1.stderr b/src/test/ui/native-library-link-flags/empty-kind-1.stderr
deleted file mode 100644
index 3e5b05493..000000000
--- a/src/test/ui/native-library-link-flags/empty-kind-1.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-error: unknown library kind ``, expected one of: static, dylib, framework, link-arg
-
diff --git a/src/test/ui/native-library-link-flags/empty-kind-2.rs b/src/test/ui/native-library-link-flags/empty-kind-2.rs
deleted file mode 100644
index 851eb63fc..000000000
--- a/src/test/ui/native-library-link-flags/empty-kind-2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// Unspecified kind should fail with an error
-
-// compile-flags: -l :+bundle=mylib
-// error-pattern: unknown library kind ``, expected one of: static, dylib, framework, link-arg
-
-fn main() {}
diff --git a/src/test/ui/native-library-link-flags/empty-kind-2.stderr b/src/test/ui/native-library-link-flags/empty-kind-2.stderr
deleted file mode 100644
index 3e5b05493..000000000
--- a/src/test/ui/native-library-link-flags/empty-kind-2.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-error: unknown library kind ``, expected one of: static, dylib, framework, link-arg
-
diff --git a/src/test/ui/native-library-link-flags/link-arg-error.rs b/src/test/ui/native-library-link-flags/link-arg-error.rs
deleted file mode 100644
index e041650d0..000000000
--- a/src/test/ui/native-library-link-flags/link-arg-error.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// compile-flags: -l link-arg:+bundle=arg -Z unstable-options
-// error-pattern: linking modifier `bundle` is only compatible with `static` linking kind
-
-fn main() {}
diff --git a/src/test/ui/native-library-link-flags/link-arg-error.stderr b/src/test/ui/native-library-link-flags/link-arg-error.stderr
deleted file mode 100644
index e1d01e141..000000000
--- a/src/test/ui/native-library-link-flags/link-arg-error.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-error: linking modifier `bundle` is only compatible with `static` linking kind
-
diff --git a/src/test/ui/native-library-link-flags/link-arg-from-rs.rs b/src/test/ui/native-library-link-flags/link-arg-from-rs.rs
deleted file mode 100644
index 075e4d9e7..000000000
--- a/src/test/ui/native-library-link-flags/link-arg-from-rs.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// link-arg is not supposed to be usable in #[link] attributes
-
-// compile-flags:
-// error-pattern: error[E0458]: unknown link kind `link-arg`, expected one of: static, dylib, framework, raw-dylib
-
-#[link(kind = "link-arg")]
-extern "C" {}
-pub fn main() {}
diff --git a/src/test/ui/native-library-link-flags/link-arg-from-rs.stderr b/src/test/ui/native-library-link-flags/link-arg-from-rs.stderr
deleted file mode 100644
index 69a7825c0..000000000
--- a/src/test/ui/native-library-link-flags/link-arg-from-rs.stderr
+++ /dev/null
@@ -1,16 +0,0 @@
-error[E0458]: unknown link kind `link-arg`, expected one of: static, dylib, framework, raw-dylib
-  --> $DIR/link-arg-from-rs.rs:6:15
-   |
-LL | #[link(kind = "link-arg")]
-   |               ^^^^^^^^^^ unknown link kind
-
-error[E0459]: `#[link]` attribute requires a `name = "string"` argument
-  --> $DIR/link-arg-from-rs.rs:6:1
-   |
-LL | #[link(kind = "link-arg")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `name` argument
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0458, E0459.
-For more information about an error, try `rustc --explain E0458`.
diff --git a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.rs b/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.rs
deleted file mode 100644
index 066048795..000000000
--- a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// compile-flags: -Zunstable-options --crate-type rlib
-// build-fail
-// error-pattern: the linking modifiers `+bundle` and `+whole-archive` are not compatible with each other when generating rlibs
-
-#[link(name = "mylib", kind = "static", modifiers = "+bundle,+whole-archive")]
-extern "C" { }
-
-fn main() { }
diff --git a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.stderr b/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.stderr
deleted file mode 100644
index 246efb8d6..000000000
--- a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive-link-attr.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-error: the linking modifiers `+bundle` and `+whole-archive` are not compatible with each other when generating rlibs
-
-error: could not find native static library `mylib`, perhaps an -L flag is missing?
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.rs b/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.rs
deleted file mode 100644
index 1d0768d99..000000000
--- a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Mixing +bundle and +whole-archive is not allowed
-
-// compile-flags: -l static:+bundle,+whole-archive=mylib -Zunstable-options --crate-type rlib
-// build-fail
-// error-pattern: the linking modifiers `+bundle` and `+whole-archive` are not compatible with each other when generating rlibs
-
-fn main() { }
diff --git a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.stderr b/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.stderr
deleted file mode 100644
index 246efb8d6..000000000
--- a/src/test/ui/native-library-link-flags/mix-bundle-and-whole-archive.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-error: the linking modifiers `+bundle` and `+whole-archive` are not compatible with each other when generating rlibs
-
-error: could not find native static library `mylib`, perhaps an -L flag is missing?
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/native-library-link-flags/modifiers-override-2.rs b/src/test/ui/native-library-link-flags/modifiers-override-2.rs
deleted file mode 100644
index 333f6786b..000000000
--- a/src/test/ui/native-library-link-flags/modifiers-override-2.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// compile-flags:-lstatic:+whole-archive,-whole-archive=foo
-
-fn main() {}
diff --git a/src/test/ui/native-library-link-flags/modifiers-override-2.stderr b/src/test/ui/native-library-link-flags/modifiers-override-2.stderr
deleted file mode 100644
index aa5b59c5b..000000000
--- a/src/test/ui/native-library-link-flags/modifiers-override-2.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-error: multiple `whole-archive` modifiers in a single `-l` option
-
diff --git a/src/test/ui/native-library-link-flags/modifiers-override-3.rs b/src/test/ui/native-library-link-flags/modifiers-override-3.rs
deleted file mode 100644
index b28c53c6b..000000000
--- a/src/test/ui/native-library-link-flags/modifiers-override-3.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Regression test for issue #97299, one command line library with modifiers
-// overrides another command line library with modifiers.
-
-// compile-flags:-lstatic:+whole-archive=foo -lstatic:+whole-archive=foo
-// error-pattern: overriding linking modifiers from command line is not supported
-
-fn main() {}
diff --git a/src/test/ui/native-library-link-flags/modifiers-override-3.stderr b/src/test/ui/native-library-link-flags/modifiers-override-3.stderr
deleted file mode 100644
index 365e56181..000000000
--- a/src/test/ui/native-library-link-flags/modifiers-override-3.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-error: overriding linking modifiers from command line is not supported
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/native-library-link-flags/modifiers-override.rs b/src/test/ui/native-library-link-flags/modifiers-override.rs
deleted file mode 100644
index 42cdb5004..000000000
--- a/src/test/ui/native-library-link-flags/modifiers-override.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// compile-flags:-ldylib:+as-needed=foo -lstatic=bar -Zunstable-options
-
-#[link(name = "foo")]
-#[link(
-    name = "bar",
-    kind = "static",
-    modifiers = "+whole-archive,-whole-archive",
-    //~^ ERROR multiple `whole-archive` modifiers in a single `modifiers` argument
-    modifiers = "+bundle"
-    //~^ ERROR multiple `modifiers` arguments in a single `#[link]` attribute
-)]
-extern "C" {}
-//~^ ERROR overriding linking modifiers from command line is not supported
-//~| ERROR overriding linking modifiers from command line is not supported
-
-fn main() {}
diff --git a/src/test/ui/native-library-link-flags/modifiers-override.stderr b/src/test/ui/native-library-link-flags/modifiers-override.stderr
deleted file mode 100644
index eb3ab55c3..000000000
--- a/src/test/ui/native-library-link-flags/modifiers-override.stderr
+++ /dev/null
@@ -1,26 +0,0 @@
-error: multiple `modifiers` arguments in a single `#[link]` attribute
-  --> $DIR/modifiers-override.rs:9:5
-   |
-LL |     modifiers = "+bundle"
-   |     ^^^^^^^^^^^^^^^^^^^^^
-
-error: multiple `whole-archive` modifiers in a single `modifiers` argument
-  --> $DIR/modifiers-override.rs:7:17
-   |
-LL |     modifiers = "+whole-archive,-whole-archive",
-   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: overriding linking modifiers from command line is not supported
-  --> $DIR/modifiers-override.rs:12:1
-   |
-LL | extern "C" {}
-   | ^^^^^^^^^^^^^
-
-error: overriding linking modifiers from command line is not supported
-  --> $DIR/modifiers-override.rs:12:1
-   |
-LL | extern "C" {}
-   | ^^^^^^^^^^^^^
-
-error: aborting due to 4 previous errors
-
diff --git a/src/test/ui/native-library-link-flags/suggest-libname-only-1.rs b/src/test/ui/native-library-link-flags/suggest-libname-only-1.rs
deleted file mode 100644
index abf988a7c..000000000
--- a/src/test/ui/native-library-link-flags/suggest-libname-only-1.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// build-fail
-// compile-flags: --crate-type rlib
-// error-pattern: could not find native static library `libfoo.a`
-// error-pattern: only provide the library name `foo`, not the full filename
-
-#[link(name = "libfoo.a", kind = "static")]
-extern { }
-
-pub fn main() { }
diff --git a/src/test/ui/native-library-link-flags/suggest-libname-only-1.stderr b/src/test/ui/native-library-link-flags/suggest-libname-only-1.stderr
deleted file mode 100644
index 64d0a9077..000000000
--- a/src/test/ui/native-library-link-flags/suggest-libname-only-1.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-error: could not find native static library `libfoo.a`, perhaps an -L flag is missing?
-   |
-   = help: only provide the library name `foo`, not the full filename
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/native-library-link-flags/suggest-libname-only-2.rs b/src/test/ui/native-library-link-flags/suggest-libname-only-2.rs
deleted file mode 100644
index dfa70e56d..000000000
--- a/src/test/ui/native-library-link-flags/suggest-libname-only-2.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// build-fail
-// compile-flags: --crate-type rlib
-// error-pattern: could not find native static library `bar.lib`
-// error-pattern: only provide the library name `bar`, not the full filename
-
-#[link(name = "bar.lib", kind = "static")]
-extern { }
-
-pub fn main() { }
diff --git a/src/test/ui/native-library-link-flags/suggest-libname-only-2.stderr b/src/test/ui/native-library-link-flags/suggest-libname-only-2.stderr
deleted file mode 100644
index e166af9ed..000000000
--- a/src/test/ui/native-library-link-flags/suggest-libname-only-2.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-error: could not find native static library `bar.lib`, perhaps an -L flag is missing?
-   |
-   = help: only provide the library name `bar`, not the full filename
-
-error: aborting due to previous error
-