diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/alloc.rs | 4 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 11 | ||||
| -rw-r--r-- | src/libstd/panicking.rs | 5 |
3 files changed, 5 insertions, 15 deletions
diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs index 6753ed4a3df..31fc9ed3f77 100644 --- a/src/libstd/alloc.rs +++ b/src/libstd/alloc.rs @@ -151,14 +151,12 @@ pub mod __default_lib_allocator { // ABI #[rustc_std_internal_symbol] - #[cfg_attr(stage0, no_mangle)] pub unsafe extern fn __rdl_alloc(size: usize, align: usize) -> *mut u8 { let layout = Layout::from_size_align_unchecked(size, align); System.alloc(layout) } #[rustc_std_internal_symbol] - #[cfg_attr(stage0, no_mangle)] pub unsafe extern fn __rdl_dealloc(ptr: *mut u8, size: usize, align: usize) { @@ -166,7 +164,6 @@ pub mod __default_lib_allocator { } #[rustc_std_internal_symbol] - #[cfg_attr(stage0, no_mangle)] pub unsafe extern fn __rdl_realloc(ptr: *mut u8, old_size: usize, align: usize, @@ -176,7 +173,6 @@ pub mod __default_lib_allocator { } #[rustc_std_internal_symbol] - #[cfg_attr(stage0, no_mangle)] pub unsafe extern fn __rdl_alloc_zeroed(size: usize, align: usize) -> *mut u8 { let layout = Layout::from_size_align_unchecked(size, align); System.alloc_zeroed(layout) diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 1eb76d6c45e..7ae4f2de4c3 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -250,8 +250,7 @@ #![feature(cfg_target_vendor)] #![feature(char_error_internals)] #![feature(compiler_builtins_lib)] -#![cfg_attr(stage0, feature(const_fn))] -#![cfg_attr(not(stage0), feature(min_const_fn))] +#![feature(min_const_fn)] #![feature(const_int_ops)] #![feature(const_ip)] #![feature(core_intrinsics)] @@ -270,10 +269,9 @@ #![feature(libc)] #![feature(link_args)] #![feature(linkage)] -#![cfg_attr(stage0, feature(macro_vis_matcher))] #![feature(needs_panic_runtime)] #![feature(never_type)] -#![cfg_attr(not(stage0), feature(nll))] +#![feature(nll)] #![feature(exhaustive_patterns)] #![feature(on_unimplemented)] #![feature(optin_builtin_traits)] @@ -286,7 +284,7 @@ #![feature(rustc_attrs)] #![feature(rustc_const_unstable)] #![feature(std_internals)] -#![feature(stdsimd)] +#![cfg_attr(not(stage0), feature(stdsimd))] #![feature(shrink_to)] #![feature(slice_concat_ext)] #![feature(slice_internals)] @@ -302,15 +300,12 @@ #![feature(unboxed_closures)] #![feature(untagged_unions)] #![feature(unwind_attributes)] -#![cfg_attr(stage0, feature(use_extern_macros))] #![feature(doc_cfg)] #![feature(doc_masked)] #![feature(doc_spotlight)] -#![cfg_attr(all(windows, stage0), feature(used))] #![feature(doc_alias)] #![feature(doc_keyword)] #![feature(panic_info_message)] -#![cfg_attr(stage0, feature(panic_implementation))] #![feature(non_exhaustive)] #![default_lib_allocator] diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs index 6eb2db8e63b..6d548443bbf 100644 --- a/src/libstd/panicking.rs +++ b/src/libstd/panicking.rs @@ -319,8 +319,7 @@ pub fn panicking() -> bool { /// Entry point of panic from the libcore crate. #[cfg(not(test))] -#[cfg_attr(stage0, panic_implementation)] -#[cfg_attr(not(stage0), panic_handler)] +#[panic_handler] #[unwind(allowed)] pub fn rust_begin_panic(info: &PanicInfo) -> ! { continue_panic_fmt(&info) @@ -398,7 +397,7 @@ fn continue_panic_fmt(info: &PanicInfo) -> ! { #[unstable(feature = "libstd_sys_internals", reason = "used by the panic! macro", issue = "0")] -#[cfg_attr(not(any(stage0, test)), lang = "begin_panic")] +#[cfg_attr(not(test), lang = "begin_panic")] #[inline(never)] #[cold] // avoid code bloat at the call sites as much as possible pub fn begin_panic<M: Any + Send>(msg: M, file_line_col: &(&'static str, u32, u32)) -> ! { // Note that this should be the only allocation performed in this code path. |