Skip to content

Commit

Permalink
Register new snapshots
Browse files Browse the repository at this point in the history
  • Loading branch information
sfackler committed Sep 29, 2014
1 parent b7aa03a commit fa419d3
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 37 deletions.
3 changes: 0 additions & 3 deletions src/libcollections/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2393,8 +2393,6 @@ mod tests {
let _ = vec[3];
}

// NOTE uncomment after snapshot
/*
#[test]
#[should_fail]
fn test_slice_out_of_bounds_1() {
Expand Down Expand Up @@ -2429,7 +2427,6 @@ mod tests {
let x: Vec<int> = vec![1, 2, 3, 4, 5];
x[3..2];
}
*/

#[test]
fn test_swap_remove_empty() {
Expand Down
23 changes: 0 additions & 23 deletions src/libcore/failure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)) -> ! {
Expand Down Expand Up @@ -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) -> !;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]

Expand Down
11 changes: 1 addition & 10 deletions src/librustrt/unwind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions src/snapshots.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit fa419d3

Please sign in to comment.