diff options
| author | bors <bors@rust-lang.org> | 2021-07-12 16:55:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-12 16:55:44 +0000 |
| commit | b5a2ccee81406303324016d03399fac68ceb6718 (patch) | |
| tree | 55cc973fe10d5f7b971d25d0d6b32268eb8ec33b | |
| parent | 3a24abd22fd25c836d8b4d75ff46c833f9c3934c (diff) | |
| parent | 4adcd600b85bd2d41a969d29ab5450a07db41565 (diff) | |
| download | rust-b5a2ccee81406303324016d03399fac68ceb6718.tar.gz rust-b5a2ccee81406303324016d03399fac68ceb6718.zip | |
Auto merge of #87087 - fee1-dead:fix-try-2, r=joshtriplett
Remove `multiple-definitions` test r? `@joshtriplett` Temporary solution to #87084.
| -rw-r--r-- | src/test/ui/rfc-2627-raw-dylib/multiple-definitions.rs | 19 | ||||
| -rw-r--r-- | src/test/ui/rfc-2627-raw-dylib/multiple-definitions.stderr | 17 |
2 files changed, 0 insertions, 36 deletions
diff --git a/src/test/ui/rfc-2627-raw-dylib/multiple-definitions.rs b/src/test/ui/rfc-2627-raw-dylib/multiple-definitions.rs deleted file mode 100644 index 3f7597498ba..00000000000 --- a/src/test/ui/rfc-2627-raw-dylib/multiple-definitions.rs +++ /dev/null @@ -1,19 +0,0 @@ -// only-i686-pc-windows-msvc -// compile-flags: --crate-type lib --emit link -#![allow(clashing_extern_declarations)] -#![feature(raw_dylib)] -//~^ WARN the feature `raw_dylib` is incomplete -#[link(name = "foo", kind = "raw-dylib")] -extern "C" { - fn f(x: i32); - //~^ ERROR multiple definitions of external function `f` from library `foo.dll` have different calling conventions -} - -pub fn lib_main() { - #[link(name = "foo", kind = "raw-dylib")] - extern "stdcall" { - fn f(x: i32); - } - - unsafe { f(42); } -} diff --git a/src/test/ui/rfc-2627-raw-dylib/multiple-definitions.stderr b/src/test/ui/rfc-2627-raw-dylib/multiple-definitions.stderr deleted file mode 100644 index 91f6f0cf722..00000000000 --- a/src/test/ui/rfc-2627-raw-dylib/multiple-definitions.stderr +++ /dev/null @@ -1,17 +0,0 @@ -warning: the feature `raw_dylib` is incomplete and may not be safe to use and/or cause compiler crashes - --> $DIR/multiple-definitions.rs:4:12 - | -LL | #![feature(raw_dylib)] - | ^^^^^^^^^ - | - = note: `#[warn(incomplete_features)]` on by default - = note: see issue #58713 <https://github.com/rust-lang/rust/issues/58713> for more information - -error: multiple definitions of external function `f` from library `foo.dll` have different calling conventions - --> $DIR/multiple-definitions.rs:8:5 - | -LL | fn f(x: i32); - | ^^^^^^^^^^^^^ - -error: aborting due to previous error; 1 warning emitted - |
