From d775e6132ceb5f7104cf2fcaa380b0fc6071301d Mon Sep 17 00:00:00 2001 From: David Wood Date: Tue, 14 Aug 2018 00:38:05 +0200 Subject: [PATCH] Moved problematic tests on x86_64-pc-windows-gnu back to compile-fail. --- .../compile-fail/auxiliary/some-panic-impl.rs | 22 +++++++++++++ .../compile-fail/auxiliary/weak-lang-items.rs | 32 +++++++++++++++++++ .../panic-implementation-missing.rs | 0 .../panic-implementation-twice.rs | 0 .../{ui => compile-fail}/weak-lang-item.rs | 0 .../panic-implementation-missing.stderr | 4 --- .../panic-implementation-twice.stderr | 14 -------- src/test/ui/weak-lang-item.stderr | 19 ----------- 8 files changed, 54 insertions(+), 37 deletions(-) create mode 100644 src/test/compile-fail/auxiliary/some-panic-impl.rs create mode 100644 src/test/compile-fail/auxiliary/weak-lang-items.rs rename src/test/{ui/panic-implementation => compile-fail}/panic-implementation-missing.rs (100%) rename src/test/{ui/panic-implementation => compile-fail}/panic-implementation-twice.rs (100%) rename src/test/{ui => compile-fail}/weak-lang-item.rs (100%) delete mode 100644 src/test/ui/panic-implementation/panic-implementation-missing.stderr delete mode 100644 src/test/ui/panic-implementation/panic-implementation-twice.stderr delete mode 100644 src/test/ui/weak-lang-item.stderr diff --git a/src/test/compile-fail/auxiliary/some-panic-impl.rs b/src/test/compile-fail/auxiliary/some-panic-impl.rs new file mode 100644 index 000000000000..db16ac325ac5 --- /dev/null +++ b/src/test/compile-fail/auxiliary/some-panic-impl.rs @@ -0,0 +1,22 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// no-prefer-dynamic + +#![crate_type = "rlib"] +#![feature(panic_implementation)] +#![no_std] + +use core::panic::PanicInfo; + +#[panic_implementation] +fn panic(info: &PanicInfo) -> ! { + loop {} +} diff --git a/src/test/compile-fail/auxiliary/weak-lang-items.rs b/src/test/compile-fail/auxiliary/weak-lang-items.rs new file mode 100644 index 000000000000..6434e62b6f70 --- /dev/null +++ b/src/test/compile-fail/auxiliary/weak-lang-items.rs @@ -0,0 +1,32 @@ +// Copyright 2014 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// no-prefer-dynamic + +// This aux-file will require the eh_personality function to be codegen'd, but +// it hasn't been defined just yet. Make sure we don't explode. + +#![no_std] +#![crate_type = "rlib"] + +struct A; + +impl core::ops::Drop for A { + fn drop(&mut self) {} +} + +pub fn foo() { + let _a = A; + panic!("wut"); +} + +mod std { + pub use core::{option, fmt}; +} diff --git a/src/test/ui/panic-implementation/panic-implementation-missing.rs b/src/test/compile-fail/panic-implementation-missing.rs similarity index 100% rename from src/test/ui/panic-implementation/panic-implementation-missing.rs rename to src/test/compile-fail/panic-implementation-missing.rs diff --git a/src/test/ui/panic-implementation/panic-implementation-twice.rs b/src/test/compile-fail/panic-implementation-twice.rs similarity index 100% rename from src/test/ui/panic-implementation/panic-implementation-twice.rs rename to src/test/compile-fail/panic-implementation-twice.rs diff --git a/src/test/ui/weak-lang-item.rs b/src/test/compile-fail/weak-lang-item.rs similarity index 100% rename from src/test/ui/weak-lang-item.rs rename to src/test/compile-fail/weak-lang-item.rs diff --git a/src/test/ui/panic-implementation/panic-implementation-missing.stderr b/src/test/ui/panic-implementation/panic-implementation-missing.stderr deleted file mode 100644 index e813338dcc08..000000000000 --- a/src/test/ui/panic-implementation/panic-implementation-missing.stderr +++ /dev/null @@ -1,4 +0,0 @@ -error: `#[panic_implementation]` function required, but not found - -error: aborting due to previous error - diff --git a/src/test/ui/panic-implementation/panic-implementation-twice.stderr b/src/test/ui/panic-implementation/panic-implementation-twice.stderr deleted file mode 100644 index 3cb6ebeb59a2..000000000000 --- a/src/test/ui/panic-implementation/panic-implementation-twice.stderr +++ /dev/null @@ -1,14 +0,0 @@ -error[E0152]: duplicate lang item found: `panic_impl`. - --> $DIR/panic-implementation-twice.rs:23:1 - | -LL | / fn panic(info: &PanicInfo) -> ! { -LL | | //~^ error duplicate lang item found: `panic_impl` -LL | | loop {} -LL | | } - | |_^ - | - = note: first defined in crate `some_panic_impl`. - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0152`. diff --git a/src/test/ui/weak-lang-item.stderr b/src/test/ui/weak-lang-item.stderr deleted file mode 100644 index e85b777b2030..000000000000 --- a/src/test/ui/weak-lang-item.stderr +++ /dev/null @@ -1,19 +0,0 @@ -error[E0259]: the name `core` is defined multiple times - --> $DIR/weak-lang-item.rs:18:1 - | -LL | extern crate core; - | ^^^^^^^^^^^^^^^^^^ `core` reimported here - | - = note: `core` must be defined only once in the type namespace of this module -help: You can use `as` to change the binding name of the import - | -LL | extern crate core as other_core; - | - -error: `#[panic_implementation]` function required, but not found - -error: language item required, but not found: `eh_personality` - -error: aborting due to 3 previous errors - -For more information about this error, try `rustc --explain E0259`.