Merging upstream version 1.72.1+dfsg1.

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

36 files changed, 0 insertions, 443 deletions

diff --git a/tests/ui/rfc-2627-raw-dylib/dlltool-failed.rs b/tests/ui/rfc-2627-raw-dylib/dlltool-failed.rs
deleted file mode 100644
index d7a418959..000000000
--- a/tests/ui/rfc-2627-raw-dylib/dlltool-failed.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Tests that dlltool failing to generate an import library will raise an error.
-
-// only-gnu
-// only-windows
-// needs-dlltool
-// compile-flags: --crate-type lib --emit link
-// normalize-stderr-test: "[^ ']*/dlltool.exe" -> "$$DLLTOOL"
-// normalize-stderr-test: "[^ ]*/foo.def" -> "$$DEF_FILE"
-#[link(name = "foo", kind = "raw-dylib")]
-extern "C" {
-    // `@1` is an invalid name to export, as it usually indicates that something
-    // is being exported via ordinal.
-    #[link_name = "@1"]
-    fn f(x: i32);
-}
-
-pub fn lib_main() {
-    unsafe { f(42); }
-}
diff --git a/tests/ui/rfc-2627-raw-dylib/dlltool-failed.stderr b/tests/ui/rfc-2627-raw-dylib/dlltool-failed.stderr
deleted file mode 100644
index 020ac6a2b..000000000
--- a/tests/ui/rfc-2627-raw-dylib/dlltool-failed.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: Dlltool could not create import library: 
-       $DLLTOOL: Syntax error in def file $DEF_FILE:1
-
-error: aborting due to previous error
-
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.rs b/tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.rs
deleted file mode 100644
index 7bc44d65b..000000000
--- a/tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// only-windows
-// only-x86
-#[link(name = "foo", kind = "raw-dylib", import_name_type = 6)]
-//~^ ERROR import name type must be of the form `import_name_type = "string"`
-extern "C" { }
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr b/tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr
deleted file mode 100644
index fb70b987f..000000000
--- a/tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: import name type must be of the form `import_name_type = "string"`
-  --> $DIR/import-name-type-invalid-format.rs:3:42
-   |
-LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = 6)]
-   |                                          ^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.rs b/tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.rs
deleted file mode 100644
index b96f61a26..000000000
--- a/tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// ignore-tidy-linelength
-// only-windows
-// only-x86
-#[link(name = "foo", kind = "raw-dylib", import_name_type = "decorated", import_name_type = "decorated")]
-//~^ ERROR multiple `import_name_type` arguments in a single `#[link]` attribute
-extern "C" { }
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.stderr b/tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.stderr
deleted file mode 100644
index 953306189..000000000
--- a/tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: multiple `import_name_type` arguments in a single `#[link]` attribute
-  --> $DIR/import-name-type-multiple.rs:4:74
-   |
-LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = "decorated", import_name_type = "decorated")]
-   |                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.rs b/tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.rs
deleted file mode 100644
index 067e82a17..000000000
--- a/tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// only-windows
-// only-x86
-#[link(name = "foo", kind = "raw-dylib", import_name_type = "unknown")]
-//~^ ERROR unknown import name type `unknown`, expected one of: decorated, noprefix, undecorated
-extern "C" { }
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr b/tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr
deleted file mode 100644
index 2bce9758e..000000000
--- a/tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: unknown import name type `unknown`, expected one of: decorated, noprefix, undecorated
-  --> $DIR/import-name-type-unknown-value.rs:3:42
-   |
-LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = "unknown")]
-   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs b/tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs
deleted file mode 100644
index 34e907bde..000000000
--- a/tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// only-windows
-// only-x86
-#[link(name = "foo", import_name_type = "decorated")]
-//~^ ERROR import name type can only be used with link kind `raw-dylib`
-extern "C" { }
-
-#[link(name = "bar", kind = "static", import_name_type = "decorated")]
-//~^ ERROR import name type can only be used with link kind `raw-dylib`
-extern "C" { }
-
-// Specifying `import_name_type` before `kind` shouldn't raise an error.
-#[link(name = "bar", import_name_type = "decorated", kind = "raw-dylib")]
-extern "C" { }
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr b/tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr
deleted file mode 100644
index 75cadc471..000000000
--- a/tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error: import name type can only be used with link kind `raw-dylib`
-  --> $DIR/import-name-type-unsupported-link-kind.rs:3:22
-   |
-LL | #[link(name = "foo", import_name_type = "decorated")]
-   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: import name type can only be used with link kind `raw-dylib`
-  --> $DIR/import-name-type-unsupported-link-kind.rs:7:39
-   |
-LL | #[link(name = "bar", kind = "static", import_name_type = "decorated")]
-   |                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
-
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.rs b/tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.rs
deleted file mode 100644
index 346ea18a8..000000000
--- a/tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// only-windows
-// ignore-x86
-#[link(name = "foo", kind = "raw-dylib", import_name_type = "decorated")]
-//~^ ERROR import name type is only supported on x86
-extern "C" { }
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.stderr b/tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.stderr
deleted file mode 100644
index b56449299..000000000
--- a/tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: import name type is only supported on x86
-  --> $DIR/import-name-type-x86-only.rs:3:42
-   |
-LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = "decorated")]
-   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/tests/ui/rfc-2627-raw-dylib/invalid-dlltool.rs b/tests/ui/rfc-2627-raw-dylib/invalid-dlltool.rs
deleted file mode 100644
index a07be9d92..000000000
--- a/tests/ui/rfc-2627-raw-dylib/invalid-dlltool.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Tests that failing to run dlltool will raise an error.
-
-// only-gnu
-// only-windows
-// compile-flags: --crate-type lib --emit link -Cdlltool=does_not_exit.exe
-#[link(name = "foo", kind = "raw-dylib")]
-extern "C" {
-    fn f(x: i32);
-}
-
-pub fn lib_main() {
-    unsafe { f(42); }
-}
diff --git a/tests/ui/rfc-2627-raw-dylib/invalid-dlltool.stderr b/tests/ui/rfc-2627-raw-dylib/invalid-dlltool.stderr
deleted file mode 100644
index 3ae901e0d..000000000
--- a/tests/ui/rfc-2627-raw-dylib/invalid-dlltool.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-error: Error calling dlltool 'does_not_exit.exe': program not found
-
-error: aborting due to previous error
-
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs
deleted file mode 100644
index b04c2facb..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#[link(name="foo")]
-extern "C" {
-    #[link_name="foo"]
-    #[link_ordinal(42)]
-    //~^ ERROR cannot use `#[link_name]` with `#[link_ordinal]`
-    fn foo();
-    #[link_name="foo"]
-    #[link_ordinal(5)]
-    //~^ ERROR cannot use `#[link_name]` with `#[link_ordinal]`
-    static mut imported_variable: i32;
-}
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr
deleted file mode 100644
index f1e54d378..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error: cannot use `#[link_name]` with `#[link_ordinal]`
-  --> $DIR/link-ordinal-and-name.rs:4:5
-   |
-LL |     #[link_ordinal(42)]
-   |     ^^^^^^^^^^^^^^^^^^^
-
-error: cannot use `#[link_name]` with `#[link_ordinal]`
-  --> $DIR/link-ordinal-and-name.rs:8:5
-   |
-LL |     #[link_ordinal(5)]
-   |     ^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
-
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs
deleted file mode 100644
index 9b7e8d707..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#[link(name = "foo")]
-extern "C" {
-    #[link_ordinal("JustMonika")]
-    //~^ ERROR illegal ordinal format in `link_ordinal`
-    fn foo();
-    #[link_ordinal("JustMonika")]
-    //~^ ERROR illegal ordinal format in `link_ordinal`
-    static mut imported_variable: i32;
-}
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr
deleted file mode 100644
index 6341e57a0..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: illegal ordinal format in `link_ordinal`
-  --> $DIR/link-ordinal-invalid-format.rs:3:5
-   |
-LL |     #[link_ordinal("JustMonika")]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: an unsuffixed integer value, e.g., `1`, is expected
-
-error: illegal ordinal format in `link_ordinal`
-  --> $DIR/link-ordinal-invalid-format.rs:6:5
-   |
-LL |     #[link_ordinal("JustMonika")]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: an unsuffixed integer value, e.g., `1`, is expected
-
-error: aborting due to 2 previous errors
-
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs
deleted file mode 100644
index 6b8cd4956..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#[link(name = "foo")]
-extern "C" {
-    #[link_ordinal()]
-    //~^ ERROR incorrect number of arguments to `#[link_ordinal]`
-    fn foo();
-    #[link_ordinal()]
-    //~^ ERROR incorrect number of arguments to `#[link_ordinal]`
-    static mut imported_variable: i32;
-}
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr
deleted file mode 100644
index 1b04bb228..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: incorrect number of arguments to `#[link_ordinal]`
-  --> $DIR/link-ordinal-missing-argument.rs:3:5
-   |
-LL |     #[link_ordinal()]
-   |     ^^^^^^^^^^^^^^^^^
-   |
-   = note: the attribute requires exactly one argument
-
-error: incorrect number of arguments to `#[link_ordinal]`
-  --> $DIR/link-ordinal-missing-argument.rs:6:5
-   |
-LL |     #[link_ordinal()]
-   |     ^^^^^^^^^^^^^^^^^
-   |
-   = note: the attribute requires exactly one argument
-
-error: aborting due to 2 previous errors
-
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.rs
deleted file mode 100644
index 8842cb944..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// only-windows
-#[link(name = "foo", kind = "raw-dylib")]
-extern "C" {
-    #[link_ordinal(1)] //~ ERROR multiple `link_ordinal` attributes
-    #[link_ordinal(2)]
-    fn foo();
-    #[link_ordinal(1)] //~ ERROR multiple `link_ordinal` attributes
-    #[link_ordinal(2)]
-    static mut imported_variable: i32;
-}
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.stderr
deleted file mode 100644
index 2e6cf3761..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.stderr
+++ /dev/null
@@ -1,26 +0,0 @@
-error: multiple `link_ordinal` attributes
-  --> $DIR/link-ordinal-multiple.rs:4:5
-   |
-LL |     #[link_ordinal(1)]
-   |     ^^^^^^^^^^^^^^^^^^ help: remove this attribute
-   |
-note: attribute also specified here
-  --> $DIR/link-ordinal-multiple.rs:5:5
-   |
-LL |     #[link_ordinal(2)]
-   |     ^^^^^^^^^^^^^^^^^^
-
-error: multiple `link_ordinal` attributes
-  --> $DIR/link-ordinal-multiple.rs:7:5
-   |
-LL |     #[link_ordinal(1)]
-   |     ^^^^^^^^^^^^^^^^^^ help: remove this attribute
-   |
-note: attribute also specified here
-  --> $DIR/link-ordinal-multiple.rs:8:5
-   |
-LL |     #[link_ordinal(2)]
-   |     ^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
-
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs
deleted file mode 100644
index f33a3d62e..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-#[link_ordinal(123)]
-//~^ ERROR attribute should be applied to a foreign function or static
-struct Foo {}
-
-#[link_ordinal(123)]
-//~^ ERROR attribute should be applied to a foreign function or static
-fn test() {}
-
-#[link_ordinal(42)]
-//~^ ERROR attribute should be applied to a foreign function or static
-static mut imported_val: i32 = 123;
-
-#[link(name = "exporter", kind = "raw-dylib")]
-extern {
-    #[link_ordinal(13)]
-    fn imported_function();
-
-    #[link_ordinal(42)]
-    static mut imported_variable: i32;
-}
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr
deleted file mode 100644
index 8f2795087..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr
+++ /dev/null
@@ -1,20 +0,0 @@
-error: attribute should be applied to a foreign function or static
-  --> $DIR/link-ordinal-not-foreign-fn.rs:1:1
-   |
-LL | #[link_ordinal(123)]
-   | ^^^^^^^^^^^^^^^^^^^^
-
-error: attribute should be applied to a foreign function or static
-  --> $DIR/link-ordinal-not-foreign-fn.rs:5:1
-   |
-LL | #[link_ordinal(123)]
-   | ^^^^^^^^^^^^^^^^^^^^
-
-error: attribute should be applied to a foreign function or static
-  --> $DIR/link-ordinal-not-foreign-fn.rs:9:1
-   |
-LL | #[link_ordinal(42)]
-   | ^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 3 previous errors
-
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs
deleted file mode 100644
index 9d741630f..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#[link(name = "foo")]
-extern "C" {
-    #[link_ordinal(72436)]
-    //~^ ERROR ordinal value in `link_ordinal` is too large: `72436`
-    fn foo();
-    #[link_ordinal(72436)]
-    //~^ ERROR ordinal value in `link_ordinal` is too large: `72436`
-    static mut imported_variable: i32;
-}
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr
deleted file mode 100644
index 811145e77..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: ordinal value in `link_ordinal` is too large: `72436`
-  --> $DIR/link-ordinal-too-large.rs:3:5
-   |
-LL |     #[link_ordinal(72436)]
-   |     ^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: the value may not exceed `u16::MAX`
-
-error: ordinal value in `link_ordinal` is too large: `72436`
-  --> $DIR/link-ordinal-too-large.rs:6:5
-   |
-LL |     #[link_ordinal(72436)]
-   |     ^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: the value may not exceed `u16::MAX`
-
-error: aborting due to 2 previous errors
-
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs
deleted file mode 100644
index 9988115fd..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#[link(name = "foo")]
-extern "C" {
-    #[link_ordinal(3, 4)]
-    //~^ ERROR incorrect number of arguments to `#[link_ordinal]`
-    fn foo();
-    #[link_ordinal(3, 4)]
-    //~^ ERROR incorrect number of arguments to `#[link_ordinal]`
-    static mut imported_variable: i32;
-}
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr
deleted file mode 100644
index d5ce8aff3..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: incorrect number of arguments to `#[link_ordinal]`
-  --> $DIR/link-ordinal-too-many-arguments.rs:3:5
-   |
-LL |     #[link_ordinal(3, 4)]
-   |     ^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: the attribute requires exactly one argument
-
-error: incorrect number of arguments to `#[link_ordinal]`
-  --> $DIR/link-ordinal-too-many-arguments.rs:6:5
-   |
-LL |     #[link_ordinal(3, 4)]
-   |     ^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: the attribute requires exactly one argument
-
-error: aborting due to 2 previous errors
-
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs b/tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs
deleted file mode 100644
index 14e915d60..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#[link(name = "foo")]
-extern "C" {
-    #[link_ordinal(3)]
-    //~^ ERROR `#[link_ordinal]` is only supported if link kind is `raw-dylib`
-    fn foo();
-}
-
-#[link(name = "bar", kind = "static")]
-extern "C" {
-    #[link_ordinal(3)]
-    //~^ ERROR `#[link_ordinal]` is only supported if link kind is `raw-dylib`
-    fn bar();
-}
-
-fn main() {}
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr b/tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr
deleted file mode 100644
index 200b8f628..000000000
--- a/tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error: `#[link_ordinal]` is only supported if link kind is `raw-dylib`
-  --> $DIR/link-ordinal-unsupported-link-kind.rs:3:5
-   |
-LL |     #[link_ordinal(3)]
-   |     ^^^^^^^^^^^^^^^^^^
-
-error: `#[link_ordinal]` is only supported if link kind is `raw-dylib`
-  --> $DIR/link-ordinal-unsupported-link-kind.rs:10:5
-   |
-LL |     #[link_ordinal(3)]
-   |     ^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
-
diff --git a/tests/ui/rfc-2627-raw-dylib/multiple-declarations.rs b/tests/ui/rfc-2627-raw-dylib/multiple-declarations.rs
deleted file mode 100644
index b4173f3b6..000000000
--- a/tests/ui/rfc-2627-raw-dylib/multiple-declarations.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// only-x86
-// only-windows
-// compile-flags: --crate-type lib --emit link
-#![allow(clashing_extern_declarations)]
-#[link(name = "foo", kind = "raw-dylib")]
-extern "C" {
-    fn f(x: i32);
-}
-
-pub fn lib_main() {
-    #[link(name = "foo", kind = "raw-dylib")]
-    extern "stdcall" {
-        fn f(x: i32);
-        //~^ ERROR multiple declarations of external function `f` from library `foo.dll` have different calling conventions
-    }
-
-    unsafe { f(42); }
-}
diff --git a/tests/ui/rfc-2627-raw-dylib/multiple-declarations.stderr b/tests/ui/rfc-2627-raw-dylib/multiple-declarations.stderr
deleted file mode 100644
index 510108405..000000000
--- a/tests/ui/rfc-2627-raw-dylib/multiple-declarations.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: multiple declarations of external function `f` from library `foo.dll` have different calling conventions
-  --> $DIR/multiple-declarations.rs:13:9
-   |
-LL |         fn f(x: i32);
-   |         ^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs b/tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs
deleted file mode 100644
index d4c6658a3..000000000
--- a/tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// ignore-windows
-// compile-flags: --crate-type lib
-#[link(name = "foo", kind = "raw-dylib")]
-//~^ ERROR: link kind `raw-dylib` is only supported on Windows targets
-extern "C" {}
diff --git a/tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr b/tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr
deleted file mode 100644
index b635a09af..000000000
--- a/tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0455]: link kind `raw-dylib` is only supported on Windows targets
-  --> $DIR/raw-dylib-windows-only.rs:3:29
-   |
-LL | #[link(name = "foo", kind = "raw-dylib")]
-   |                             ^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0455`.
diff --git a/tests/ui/rfc-2627-raw-dylib/unsupported-abi.rs b/tests/ui/rfc-2627-raw-dylib/unsupported-abi.rs
deleted file mode 100644
index 2f5a23e47..000000000
--- a/tests/ui/rfc-2627-raw-dylib/unsupported-abi.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// only-x86_64
-// only-windows
-// compile-flags: --crate-type lib --emit link
-#[link(name = "foo", kind = "raw-dylib")]
-extern "stdcall" {
-    fn f(x: i32);
-    //~^ ERROR ABI not supported by `#[link(kind = "raw-dylib")]` on this architecture
-}
-
-pub fn lib_main() {
-    unsafe { f(42); }
-}
diff --git a/tests/ui/rfc-2627-raw-dylib/unsupported-abi.stderr b/tests/ui/rfc-2627-raw-dylib/unsupported-abi.stderr
deleted file mode 100644
index f8265ae69..000000000
--- a/tests/ui/rfc-2627-raw-dylib/unsupported-abi.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: ABI not supported by `#[link(kind = "raw-dylib")]` on this architecture
-  --> $DIR/unsupported-abi.rs:6:5
-   |
-LL |     fn f(x: i32);
-   |     ^^^^^^^^^^^^^
-
-error: aborting due to previous error
-