Auto merge of #87087 - fee1-dead:fix-try-2, r=joshtriplett

Remove `multiple-definitions` test

r? `@joshtriplett`

Temporary solution to #87084.
This commit is contained in:
bors 2021-07-12 16:55:44 +00:00
commit b5a2ccee81
2 changed files with 0 additions and 36 deletions

View file

@ -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); }
}

View file

@ -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