Merging upstream version 1.68.2+dfsg1.

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

8 files changed, 0 insertions, 47 deletions

diff --git a/src/test/ui/rfc-1717-dllimport/missing-link-attr.rs b/src/test/ui/rfc-1717-dllimport/missing-link-attr.rs
deleted file mode 100644
index b46d85160..000000000
--- a/src/test/ui/rfc-1717-dllimport/missing-link-attr.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// compile-flags: -l foo:bar
-// error-pattern: renaming of the library `foo` was specified
-
-#![crate_type = "lib"]
diff --git a/src/test/ui/rfc-1717-dllimport/missing-link-attr.stderr b/src/test/ui/rfc-1717-dllimport/missing-link-attr.stderr
deleted file mode 100644
index d4410e147..000000000
--- a/src/test/ui/rfc-1717-dllimport/missing-link-attr.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-error: renaming of the library `foo` was specified, however this crate contains no `#[link(...)]` attributes referencing this library
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/rfc-1717-dllimport/multiple-renames.rs b/src/test/ui/rfc-1717-dllimport/multiple-renames.rs
deleted file mode 100644
index 106f196b4..000000000
--- a/src/test/ui/rfc-1717-dllimport/multiple-renames.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// compile-flags: -l foo:bar -l foo:baz
-// error-pattern: multiple renamings were specified for library
-
-#![crate_type = "lib"]
-
-#[link(name = "foo")]
-extern "C" {}
diff --git a/src/test/ui/rfc-1717-dllimport/multiple-renames.stderr b/src/test/ui/rfc-1717-dllimport/multiple-renames.stderr
deleted file mode 100644
index a6fec9c4e..000000000
--- a/src/test/ui/rfc-1717-dllimport/multiple-renames.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-error: multiple renamings were specified for library `foo`
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/rfc-1717-dllimport/rename-modifiers.rs b/src/test/ui/rfc-1717-dllimport/rename-modifiers.rs
deleted file mode 100644
index 30f4db718..000000000
--- a/src/test/ui/rfc-1717-dllimport/rename-modifiers.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// compile-flags: -l dylib=foo:bar
-// error-pattern: overriding linking modifiers from command line is not supported
-
-#![feature(native_link_modifiers_as_needed)]
-
-#![crate_type = "lib"]
-
-#[link(name = "foo", kind = "dylib", modifiers = "-as-needed")]
-extern "C" {}
diff --git a/src/test/ui/rfc-1717-dllimport/rename-modifiers.stderr b/src/test/ui/rfc-1717-dllimport/rename-modifiers.stderr
deleted file mode 100644
index bee639bf2..000000000
--- a/src/test/ui/rfc-1717-dllimport/rename-modifiers.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: overriding linking modifiers from command line is not supported
-  --> $DIR/rename-modifiers.rs:9:1
-   |
-LL | extern "C" {}
-   | ^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/rfc-1717-dllimport/rename-to-empty.rs b/src/test/ui/rfc-1717-dllimport/rename-to-empty.rs
deleted file mode 100644
index 9356c4129..000000000
--- a/src/test/ui/rfc-1717-dllimport/rename-to-empty.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// compile-flags: -l foo:
-// error-pattern: an empty renaming target was specified for library
-
-#![crate_type = "lib"]
-
-#[link(name = "foo")]
-extern "C" {}
diff --git a/src/test/ui/rfc-1717-dllimport/rename-to-empty.stderr b/src/test/ui/rfc-1717-dllimport/rename-to-empty.stderr
deleted file mode 100644
index aca839d80..000000000
--- a/src/test/ui/rfc-1717-dllimport/rename-to-empty.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-error: an empty renaming target was specified for library `foo`
-
-error: aborting due to previous error
-