diff options
| author | bors <bors@rust-lang.org> | 2016-05-31 16:12:16 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-31 16:12:16 -0700 |
| commit | 601eb13dc4dd075f82f03c85bbf8a1fbadfe2d6e (patch) | |
| tree | 3e08c66b9c125b072ea0611ca39f8e482d291178 /src/libstd/lib.rs | |
| parent | 298730e7032cd55809423773da397cd5c7d827d4 (diff) | |
| parent | fa45670ce4c3813e9af0e50a6b61742310fdaa88 (diff) | |
| download | rust-601eb13dc4dd075f82f03c85bbf8a1fbadfe2d6e.tar.gz rust-601eb13dc4dd075f82f03c85bbf8a1fbadfe2d6e.zip | |
Auto merge of #33857 - alexcrichton:new-stage0, r=nikomatsakis
mk: Prepare for a new stage0 compiler This commit prepares the source for a new stage0 compiler, the 1.10.0 beta compiler. These artifacts are hot off the bots and should be ready to go.
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 10 |
1 files changed, 3 insertions, 7 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 |