diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 10 | ||||
| -rw-r--r-- | src/libstd/rt.rs | 3 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 8f41bdf39e9..7114d47e6e8 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -210,6 +210,8 @@ test(no_crate_inject, attr(deny(warnings))), test(attr(allow(dead_code, deprecated, unused_variables, unused_mut))))] +#![needs_panic_runtime] + #![feature(alloc)] #![feature(allow_internal_unstable)] #![feature(asm)] @@ -272,6 +274,7 @@ #![feature(zero_one)] #![feature(question_mark)] #![feature(try_from)] +#![feature(needs_panic_runtime)] // Issue# 30592: Systematically use alloc_system during stage0 since jemalloc // might be unavailable or disabled @@ -284,13 +287,6 @@ #![allow(unused_features)] // std may use features in a platform-specific way #![cfg_attr(not(stage0), deny(warnings))] -// FIXME(stage0): after a snapshot, move needs_panic_runtime up above and remove -// this `extern crate` declaration and feature(panic_unwind) -#![cfg_attr(not(stage0), needs_panic_runtime)] -#![cfg_attr(not(stage0), feature(needs_panic_runtime))] -#[cfg(stage0)] -extern crate panic_unwind as __please_just_link_me_dont_reference_me; - #[cfg(test)] extern crate test; // We want to reexport a few macros from core but libcore has already been diff --git a/src/libstd/rt.rs b/src/libstd/rt.rs index 6eee4ee9bbe..7217eaa1325 100644 --- a/src/libstd/rt.rs +++ b/src/libstd/rt.rs @@ -27,9 +27,6 @@ // Reexport some of our utilities which are expected by other crates. pub use panicking::{begin_panic, begin_panic_fmt}; -#[cfg(stage0)] -pub use panicking::begin_panic as begin_unwind; - #[cfg(not(test))] #[lang = "start"] fn lang_start(main: *const u8, argc: isize, argv: *const *const u8) -> isize { |