about summary refs log tree commit diff
path: root/src/test/ui/panic-implementation
diff options
context:
space:
mode:
authorDavid Wood <david@davidtw.co>2018-08-14 00:38:05 +0200
committerDavid Wood <david@davidtw.co>2018-08-14 11:12:12 +0200
commitd775e6132ceb5f7104cf2fcaa380b0fc6071301d (patch)
tree44c2aec8f60edd1cd27330f81932628ccba2601a /src/test/ui/panic-implementation
parent67ec37b608dac30b6a47b43556dbf5d607788b05 (diff)
downloadrust-d775e6132ceb5f7104cf2fcaa380b0fc6071301d.tar.gz
rust-d775e6132ceb5f7104cf2fcaa380b0fc6071301d.zip
Moved problematic tests on x86_64-pc-windows-gnu back to compile-fail.
Diffstat (limited to 'src/test/ui/panic-implementation')
-rw-r--r--src/test/ui/panic-implementation/panic-implementation-missing.rs18
-rw-r--r--src/test/ui/panic-implementation/panic-implementation-missing.stderr4
-rw-r--r--src/test/ui/panic-implementation/panic-implementation-twice.rs29
-rw-r--r--src/test/ui/panic-implementation/panic-implementation-twice.stderr14
4 files changed, 0 insertions, 65 deletions
diff --git a/src/test/ui/panic-implementation/panic-implementation-missing.rs b/src/test/ui/panic-implementation/panic-implementation-missing.rs
deleted file mode 100644
index b11081a3e3b..00000000000
--- a/src/test/ui/panic-implementation/panic-implementation-missing.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// error-pattern: `#[panic_implementation]` function required, but not found
-
-#![feature(lang_items)]
-#![no_main]
-#![no_std]
-
-#[lang = "eh_personality"]
-fn eh() {}
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 e813338dcc0..00000000000
--- 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.rs b/src/test/ui/panic-implementation/panic-implementation-twice.rs
deleted file mode 100644
index 78dc545c036..00000000000
--- a/src/test/ui/panic-implementation/panic-implementation-twice.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// 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 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// aux-build:some-panic-impl.rs
-
-#![feature(panic_implementation)]
-#![feature(lang_items)]
-#![no_std]
-#![no_main]
-
-extern crate some_panic_impl;
-
-use core::panic::PanicInfo;
-
-#[panic_implementation]
-fn panic(info: &PanicInfo) -> ! {
-    //~^ error duplicate lang item found: `panic_impl`
-    loop {}
-}
-
-#[lang = "eh_personality"]
-fn eh() {}
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 3cb6ebeb59a..00000000000
--- 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`.