diff options
| author | bors <bors@rust-lang.org> | 2018-08-26 04:02:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-08-26 04:02:19 +0000 |
| commit | 691638582ad1029e77e4ceec3a5f0f6a6449841b (patch) | |
| tree | ae6bac52a73cca46785ba3680eaecdb27cad7dbe /src/libstd | |
| parent | 36f14b95a2a2849600f7719007b5fe9c4e9bb569 (diff) | |
| parent | 40a38b01641d453a7b0f4d6af853d06b8cfef161 (diff) | |
| download | rust-691638582ad1029e77e4ceec3a5f0f6a6449841b.tar.gz rust-691638582ad1029e77e4ceec3a5f0f6a6449841b.zip | |
Auto merge of #53619 - japaric:panic-handler, r=SimonSapin
add #[panic_handler]; deprecate #[panic_implementation] r? @SimonSapin cc #44489
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 3 | ||||
| -rw-r--r-- | src/libstd/panicking.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 8b424716746..f8b425bc785 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -309,7 +309,8 @@ #![feature(doc_alias)] #![feature(doc_keyword)] #![feature(panic_info_message)] -#![feature(panic_implementation)] +#![cfg_attr(stage0, feature(panic_implementation))] +#![cfg_attr(not(stage0), feature(panic_handler))] #![feature(non_exhaustive)] #![default_lib_allocator] diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs index 862f0fd71b0..6eb2db8e63b 100644 --- a/src/libstd/panicking.rs +++ b/src/libstd/panicking.rs @@ -319,7 +319,8 @@ pub fn panicking() -> bool { /// Entry point of panic from the libcore crate. #[cfg(not(test))] -#[panic_implementation] +#[cfg_attr(stage0, panic_implementation)] +#[cfg_attr(not(stage0), panic_handler)] #[unwind(allowed)] pub fn rust_begin_panic(info: &PanicInfo) -> ! { continue_panic_fmt(&info) |