Merging upstream version 1.68.2+dfsg1.

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

32 files changed, 0 insertions, 428 deletions

diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.rs b/src/test/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.rs
deleted file mode 100644
index 22d57f8be..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// only-windows
-// only-x86
-#![feature(raw_dylib)]
-
-#[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/src/test/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr b/src/test/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr
deleted file mode 100644
index 0e95fec29..000000000
--- a/src/test/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:5:42
-   |
-LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = 6)]
-   |                                          ^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-multiple.rs b/src/test/ui/rfc-2627-raw-dylib/import-name-type-multiple.rs
deleted file mode 100644
index 7ccb0082f..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-multiple.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// ignore-tidy-linelength
-// only-windows
-// only-x86
-#![feature(raw_dylib)]
-
-#[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/src/test/ui/rfc-2627-raw-dylib/import-name-type-multiple.stderr b/src/test/ui/rfc-2627-raw-dylib/import-name-type-multiple.stderr
deleted file mode 100644
index 7c0e0be91..000000000
--- a/src/test/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:6: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/src/test/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.rs b/src/test/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.rs
deleted file mode 100644
index f728a578d..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// only-windows
-// only-x86
-#![feature(raw_dylib)]
-
-#[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/src/test/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr b/src/test/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr
deleted file mode 100644
index 2b299f2fe..000000000
--- a/src/test/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:5:42
-   |
-LL | #[link(name = "foo", kind = "raw-dylib", import_name_type = "unknown")]
-   |                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs b/src/test/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs
deleted file mode 100644
index ae9207864..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// only-windows
-// only-x86
-#![feature(raw_dylib)]
-
-#[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/src/test/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr b/src/test/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr
deleted file mode 100644
index 5898cd875..000000000
--- a/src/test/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:5: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:9:39
-   |
-LL | #[link(name = "bar", kind = "static", import_name_type = "decorated")]
-   |                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/rfc-2627-raw-dylib/import-name-type-x86-only.rs b/src/test/ui/rfc-2627-raw-dylib/import-name-type-x86-only.rs
deleted file mode 100644
index 346ea18a8..000000000
--- a/src/test/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/src/test/ui/rfc-2627-raw-dylib/import-name-type-x86-only.stderr b/src/test/ui/rfc-2627-raw-dylib/import-name-type-x86-only.stderr
deleted file mode 100644
index b56449299..000000000
--- a/src/test/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/src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs
deleted file mode 100644
index 1a128c87a..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#![cfg_attr(target_arch = "x86", feature(raw_dylib))]
-
-#[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/src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr
deleted file mode 100644
index 481a06d27..000000000
--- a/src/test/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:6:5
-   |
-LL |     #[link_ordinal(42)]
-   |     ^^^^^^^^^^^^^^^^^^^
-
-error: cannot use `#[link_name]` with `#[link_ordinal]`
-  --> $DIR/link-ordinal-and-name.rs:10:5
-   |
-LL |     #[link_ordinal(5)]
-   |     ^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs
deleted file mode 100644
index 7c8da050c..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#![cfg_attr(target_arch = "x86", feature(raw_dylib))]
-
-#[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/src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr
deleted file mode 100644
index 55cdcad75..000000000
--- a/src/test/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:5: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:8: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/src/test/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs
deleted file mode 100644
index 9feed3941..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#![cfg_attr(target_arch = "x86", feature(raw_dylib))]
-
-#[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/src/test/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr
deleted file mode 100644
index 853cdad8c..000000000
--- a/src/test/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:5: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:8:5
-   |
-LL |     #[link_ordinal()]
-   |     ^^^^^^^^^^^^^^^^^
-   |
-   = note: the attribute requires exactly one argument
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-multiple.rs b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-multiple.rs
deleted file mode 100644
index 631c363d4..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-multiple.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// only-windows
-#![cfg_attr(target_arch = "x86", feature(raw_dylib))]
-
-#[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/src/test/ui/rfc-2627-raw-dylib/link-ordinal-multiple.stderr b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-multiple.stderr
deleted file mode 100644
index c0453d2bf..000000000
--- a/src/test/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:6:5
-   |
-LL |     #[link_ordinal(1)]
-   |     ^^^^^^^^^^^^^^^^^^ help: remove this attribute
-   |
-note: attribute also specified here
-  --> $DIR/link-ordinal-multiple.rs:7:5
-   |
-LL |     #[link_ordinal(2)]
-   |     ^^^^^^^^^^^^^^^^^^
-
-error: multiple `link_ordinal` attributes
-  --> $DIR/link-ordinal-multiple.rs:9:5
-   |
-LL |     #[link_ordinal(1)]
-   |     ^^^^^^^^^^^^^^^^^^ help: remove this attribute
-   |
-note: attribute also specified here
-  --> $DIR/link-ordinal-multiple.rs:10:5
-   |
-LL |     #[link_ordinal(2)]
-   |     ^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs
deleted file mode 100644
index 54e614164..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-#![cfg_attr(target_arch = "x86", feature(raw_dylib))]
-
-#[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/src/test/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr
deleted file mode 100644
index ec4104fbe..000000000
--- a/src/test/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:3:1
-   |
-LL | #[link_ordinal(123)]
-   | ^^^^^^^^^^^^^^^^^^^^
-
-error: attribute should be applied to a foreign function or static
-  --> $DIR/link-ordinal-not-foreign-fn.rs:7:1
-   |
-LL | #[link_ordinal(123)]
-   | ^^^^^^^^^^^^^^^^^^^^
-
-error: attribute should be applied to a foreign function or static
-  --> $DIR/link-ordinal-not-foreign-fn.rs:11:1
-   |
-LL | #[link_ordinal(42)]
-   | ^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 3 previous errors
-
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs
deleted file mode 100644
index 46731581e..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#![cfg_attr(target_arch = "x86", feature(raw_dylib))]
-
-#[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/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr
deleted file mode 100644
index fef6de6ae..000000000
--- a/src/test/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:5: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:8:5
-   |
-LL |     #[link_ordinal(72436)]
-   |     ^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: the value may not exceed `u16::MAX`
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs
deleted file mode 100644
index 71e0ac9f3..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#![cfg_attr(target_arch = "x86", feature(raw_dylib))]
-
-#[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/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr
deleted file mode 100644
index 7e0fcd845..000000000
--- a/src/test/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:5: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:8:5
-   |
-LL |     #[link_ordinal(3, 4)]
-   |     ^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: the attribute requires exactly one argument
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs
deleted file mode 100644
index 329c93fc1..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-#![cfg_attr(target_arch = "x86", feature(raw_dylib))]
-
-#[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/src/test/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr b/src/test/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr
deleted file mode 100644
index 5fbffbda5..000000000
--- a/src/test/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:5:5
-   |
-LL |     #[link_ordinal(3)]
-   |     ^^^^^^^^^^^^^^^^^^
-
-error: `#[link_ordinal]` is only supported if link kind is `raw-dylib`
-  --> $DIR/link-ordinal-unsupported-link-kind.rs:12:5
-   |
-LL |     #[link_ordinal(3)]
-   |     ^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/rfc-2627-raw-dylib/multiple-declarations.rs b/src/test/ui/rfc-2627-raw-dylib/multiple-declarations.rs
deleted file mode 100644
index 6542faad2..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/multiple-declarations.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// only-x86
-// only-windows
-// compile-flags: --crate-type lib --emit link
-#![allow(clashing_extern_declarations)]
-#![feature(raw_dylib)]
-#[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/src/test/ui/rfc-2627-raw-dylib/multiple-declarations.stderr b/src/test/ui/rfc-2627-raw-dylib/multiple-declarations.stderr
deleted file mode 100644
index c6808bec7..000000000
--- a/src/test/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:14:9
-   |
-LL |         fn f(x: i32);
-   |         ^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs b/src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs
deleted file mode 100644
index 4efffbd53..000000000
--- a/src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// ignore-windows
-// compile-flags: --crate-type lib
-#![cfg_attr(target_arch = "x86", feature(raw_dylib))]
-#[link(name = "foo", kind = "raw-dylib")]
-//~^ ERROR: link kind `raw-dylib` is only supported on Windows targets
-extern "C" {}
diff --git a/src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr b/src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr
deleted file mode 100644
index 14e791f1f..000000000
--- a/src/test/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:4: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/src/test/ui/rfc-2627-raw-dylib/unsupported-abi.rs b/src/test/ui/rfc-2627-raw-dylib/unsupported-abi.rs
deleted file mode 100644
index 2f5a23e47..000000000
--- a/src/test/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/src/test/ui/rfc-2627-raw-dylib/unsupported-abi.stderr b/src/test/ui/rfc-2627-raw-dylib/unsupported-abi.stderr
deleted file mode 100644
index f8265ae69..000000000
--- a/src/test/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
-