diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index f66495c4057..fce327398e3 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -70,8 +70,6 @@ test(no_crate_inject))] #![no_std] -// SNAP d4432b3 -#![allow(unused_features)] // until feature(placement_in_syntax) is in snap #![feature(allocator)] #![feature(box_syntax)] #![feature(coerce_unsized)] diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs index 1d466895f2c..80b7587ed36 100644 --- a/src/libcore/intrinsics.rs +++ b/src/libcore/intrinsics.rs @@ -184,19 +184,11 @@ extern "rust-intrinsic" { /// elements. pub fn size_of() -> usize; - #[cfg(not(stage0))] /// Moves a value to an uninitialized memory location. /// /// Drop glue is not run on the destination. pub fn move_val_init(dst: *mut T, src: T); - // SNAP d4432b3 - #[cfg(stage0)] - /// Moves a value to an uninitialized memory location. - /// - /// Drop glue is not run on the destination. - pub fn move_val_init(dst: &mut T, src: T); - pub fn min_align_of() -> usize; pub fn pref_align_of() -> usize; @@ -614,6 +606,5 @@ extern "rust-intrinsic" { /// Rust's "try catch" construct which invokes the function pointer `f` with /// the data pointer `data`, returning the exception payload if an exception /// is thrown (aka the thread panics). - #[cfg(not(stage0))] pub fn try(f: fn(*mut u8), data: *mut u8) -> *mut u8; } diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 440e3a26f6b..1fff123c7aa 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -203,7 +203,6 @@ test(no_crate_inject, attr(deny(warnings))), test(attr(allow(dead_code, deprecated, unused_variables, unused_mut))))] -#![cfg_attr(stage0, allow(unused_features))] #![feature(alloc)] #![feature(allow_internal_unstable)] #![feature(associated_consts)] diff --git a/src/libstd/rt/unwind/gcc.rs b/src/libstd/rt/unwind/gcc.rs index 59fc8df6107..23e10ee6c39 100644 --- a/src/libstd/rt/unwind/gcc.rs +++ b/src/libstd/rt/unwind/gcc.rs @@ -115,7 +115,7 @@ pub mod eabi { } } - #[cfg_attr(not(stage0), lang = "eh_personality_catch")] + #[lang = "eh_personality_catch"] #[no_mangle] pub extern fn rust_eh_personality_catch( _version: c_int, @@ -168,7 +168,7 @@ pub mod eabi { } } - #[cfg_attr(not(stage0), lang = "eh_personality_catch")] + #[lang = "eh_personality_catch"] #[no_mangle] pub extern fn rust_eh_personality_catch( _version: c_int, @@ -218,7 +218,7 @@ pub mod eabi { } } - #[cfg_attr(not(stage0), lang = "eh_personality_catch")] + #[lang = "eh_personality_catch"] #[no_mangle] pub extern fn rust_eh_personality_catch( state: uw::_Unwind_State, @@ -307,7 +307,7 @@ pub mod eabi { } } - #[cfg_attr(not(stage0), lang = "eh_personality_catch")] + #[lang = "eh_personality_catch"] #[no_mangle] pub extern fn rust_eh_personality_catch( exceptionRecord: *mut EXCEPTION_RECORD, diff --git a/src/libstd/rt/unwind/mod.rs b/src/libstd/rt/unwind/mod.rs index db2310ba361..60eced014de 100644 --- a/src/libstd/rt/unwind/mod.rs +++ b/src/libstd/rt/unwind/mod.rs @@ -139,7 +139,6 @@ pub unsafe fn try(f: F) -> Result<(), Box> { // `dllexport`, but it's easier to not have conditional `src/rt/rust_try.ll` // files and instead just have this non-generic shim the compiler can take // care of exposing correctly. - #[cfg(not(stage0))] unsafe fn inner_try(f: fn(*mut u8), data: *mut u8) -> Result<(), Box> { let prev = PANICKING.with(|s| s.get()); @@ -152,11 +151,6 @@ pub unsafe fn try(f: F) -> Result<(), Box> { Err(imp::cleanup(ep)) } } - #[cfg(stage0)] - unsafe fn inner_try(f: fn(*mut u8), data: *mut u8) - -> Result<(), Box> { - Ok(f(data)) - } fn try_fn(opt_closure: *mut u8) { let opt_closure = opt_closure as *mut Option; diff --git a/src/snapshots.txt b/src/snapshots.txt index 5c3e55e2862..d317b5be4c1 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,13 @@ +S 2015-07-26 a5c12f4 + bitrig-x86_64 8734eb41ffbe6ddc1120aa2910db4162ec9cf270 + freebsd-x86_64 bc50b0f8d7f6d62f4f5ffa136f5387f5bf6524fd + linux-i386 3459275cdf3896f678e225843fa56f0d9fdbabe8 + linux-x86_64 e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c + macos-i386 428944a7984c0988e77909d82ca2ef77d96a1fbd + macos-x86_64 b0515bb7d2892b9a58282fc865fee11a885406d6 + winnt-i386 22286e815372c3e03729853af48a2f6d538ed086 + winnt-x86_64 f13aa3c02a15f8e794b9e180487bdf04378f8f04 + S 2015-07-17 d4432b3 bitrig-x86_64 af77768e0eb0f4c7ec5a8e36047a08053b54b230 freebsd-i386 b049325e5b2efe5f4884f3dafda448c1dac49b4f