about summary refs log tree commit diff
path: root/src/test/ui/panic-implementation/panic-implementation-deprecated.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-11-06 09:20:31 +0000
committerbors <bors@rust-lang.org>2018-11-06 09:20:31 +0000
commitf90aab7aa9bb5834b340eaef0326994e5e09b933 (patch)
tree512ae3004f0e3c52b761bf370beec7c72f68d3ba /src/test/ui/panic-implementation/panic-implementation-deprecated.rs
parent24e66c28980442a48d9458f1a4f9b76cc722dc8a (diff)
parent8589ca08b1006feb8b1bd89d87669024509bab81 (diff)
downloadrust-f90aab7aa9bb5834b340eaef0326994e5e09b933.tar.gz
rust-f90aab7aa9bb5834b340eaef0326994e5e09b933.zip
Auto merge of #55710 - kennytm:rollup, r=kennytm
Rollup of 11 pull requests

Successful merges:

 - #55490 (resolve: Fix ICE in macro import error recovery)
 - #55597 (std: Enable usage of `thread_local!` through imports)
 - #55601 (Fix tracking issue numbers for some unstable features)
 - #55621 (Add precision for create_dir function)
 - #55644 (ci: Add Dockerfile for dist-powerpcspe-linux)
 - #55664 (Make "all possible cases" help message uniform with existing help messages)
 - #55689 (miri: binary_op_val -> binary_op_imm)
 - #55694 (Fixes #31076)
 - #55696 (NLL Diagnostic Review 3: Missing errors for borrows of union fields)
 - #55700 (Update ui tests with respect to NLL)
 - #55703 (Update `configure --help` (via configure.py) to reflect decoupling of debug+optimize)
Diffstat (limited to 'src/test/ui/panic-implementation/panic-implementation-deprecated.rs')
-rw-r--r--src/test/ui/panic-implementation/panic-implementation-deprecated.rs24
1 files changed, 0 insertions, 24 deletions
diff --git a/src/test/ui/panic-implementation/panic-implementation-deprecated.rs b/src/test/ui/panic-implementation/panic-implementation-deprecated.rs
deleted file mode 100644
index c4bec01f6af..00000000000
--- a/src/test/ui/panic-implementation/panic-implementation-deprecated.rs
+++ /dev/null
@@ -1,24 +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.
-
-// compile-flags:-C panic=abort
-
-#![deny(deprecated)]
-#![feature(panic_implementation)]
-#![no_std]
-
-use core::panic::PanicInfo;
-
-#[panic_implementation]
-fn panic(info: &PanicInfo) -> ! {
-    loop {}
-}
-
-fn main() {}