diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 479a4c3045a..8bccda37c24 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -2393,8 +2393,6 @@ mod tests { let _ = vec[3]; } - // NOTE uncomment after snapshot - /* #[test] #[should_fail] fn test_slice_out_of_bounds_1() { @@ -2429,7 +2427,6 @@ mod tests { let x: Vec = vec![1, 2, 3, 4, 5]; x[3..2]; } - */ #[test] fn test_swap_remove_empty() { diff --git a/src/libcore/failure.rs b/src/libcore/failure.rs index f5f45b2f72e..ada83dae9aa 100644 --- a/src/libcore/failure.rs +++ b/src/libcore/failure.rs @@ -33,21 +33,6 @@ use fmt; use intrinsics; -// NOTE: remove after next snapshot -#[cfg(stage0)] -#[cold] #[inline(never)] // this is the slow path, always -#[lang="fail_"] -fn fail_(expr_file_line: &(&'static str, &'static str, uint)) -> ! { - let (expr, file, line) = *expr_file_line; - let ref file_line = (file, line); - format_args!(|args| -> () { - fail_fmt(args, file_line); - }, "{}", expr); - - unsafe { intrinsics::abort() } -} - -#[cfg(not(stage0))] #[cold] #[inline(never)] // this is the slow path, always #[lang="fail"] fn fail(expr_file_line: &(&'static str, &'static str, uint)) -> ! { @@ -79,14 +64,6 @@ pub fn fail_str(msg: &str, file: &(&'static str, uint)) -> ! { pub fn fail_fmt(fmt: &fmt::Arguments, file_line: &(&'static str, uint)) -> ! { #[allow(ctypes)] extern { - - // NOTE: remove after next snapshot - #[cfg(stage0)] - #[lang = "begin_unwind"] - fn fail_impl(fmt: &fmt::Arguments, file: &'static str, - line: uint) -> !; - - #[cfg(not(stage0))] #[lang = "fail_fmt"] fn fail_impl(fmt: &fmt::Arguments, file: &'static str, line: uint) -> !; diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index c67f673879e..be3867eaba2 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -32,7 +32,6 @@ This API is completely unstable and subject to change. #![feature(macro_rules, globs, struct_variant, quote)] #![feature(default_type_params, phase, unsafe_destructor)] -#![allow(unknown_features)] // NOTE: Remove after next snapshot #![feature(rustc_diagnostic_macros)] #![feature(import_shadowing)] diff --git a/src/librustrt/unwind.rs b/src/librustrt/unwind.rs index 034ed470c97..20c4e26f4e9 100644 --- a/src/librustrt/unwind.rs +++ b/src/librustrt/unwind.rs @@ -488,22 +488,13 @@ pub mod eabi { } // Entry point of failure from the libcore crate -#[cfg(not(test), not(stage0))] +#[cfg(not(test))] #[lang = "fail_fmt"] pub extern fn rust_begin_unwind(msg: &fmt::Arguments, file: &'static str, line: uint) -> ! { begin_unwind_fmt(msg, &(file, line)) } -// -// Entry point of failure from the libcore crate -#[cfg(stage0, not(test))] -#[lang = "begin_unwind"] -pub extern fn rust_begin_unwind(msg: &fmt::Arguments, - file: &'static str, line: uint) -> ! { - begin_unwind_fmt(msg, &(file, line)) -} - /// The entry point for unwinding with a formatted message. /// /// This is designed to reduce the amount of code required at the call diff --git a/src/snapshots.txt b/src/snapshots.txt index b779b56bff5..154191bb488 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,12 @@ +S 2014-09-28 7eb9337 + freebsd-x86_64 d45e0edd44f40a976ea0affaadd98732684cfca0 + linux-i386 3acb35755aa62b7ff78f76007d9a70696fce7aa7 + linux-x86_64 2615b67b700ae8f7d8d87c043207a1a6e2339389 + macos-i386 5eb4552dc66a14e1eff6e806a8ba27f4a73bb02a + macos-x86_64 c6052632443f638f5024ae38f33ae2c80d8b18bd + winnt-i386 269f46347b5766bff6f888c4307d50c475d3fe0f + winnt-x86_64 06f89825cecda7f2e36a4660ffe6d2d4a0430ab4 + S 2014-09-22 437179e freebsd-x86_64 f693c0441de3dbb2d471dde5a5045ac8a48807d8 linux-i386 5c2132b65f45c21b43d28de6a9460978b1a7b08a