Skip to content

Commit fa419d3

Browse files
committed
Register new snapshots
1 parent b7aa03a commit fa419d3

File tree

5 files changed

+10
-37
lines changed

5 files changed

+10
-37
lines changed

src/libcollections/vec.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2393,8 +2393,6 @@ mod tests {
23932393
let _ = vec[3];
23942394
}
23952395

2396-
// NOTE uncomment after snapshot
2397-
/*
23982396
#[test]
23992397
#[should_fail]
24002398
fn test_slice_out_of_bounds_1() {
@@ -2429,7 +2427,6 @@ mod tests {
24292427
let x: Vec<int> = vec![1, 2, 3, 4, 5];
24302428
x[3..2];
24312429
}
2432-
*/
24332430

24342431
#[test]
24352432
fn test_swap_remove_empty() {

src/libcore/failure.rs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,6 @@
3333
use fmt;
3434
use intrinsics;
3535

36-
// NOTE: remove after next snapshot
37-
#[cfg(stage0)]
38-
#[cold] #[inline(never)] // this is the slow path, always
39-
#[lang="fail_"]
40-
fn fail_(expr_file_line: &(&'static str, &'static str, uint)) -> ! {
41-
let (expr, file, line) = *expr_file_line;
42-
let ref file_line = (file, line);
43-
format_args!(|args| -> () {
44-
fail_fmt(args, file_line);
45-
}, "{}", expr);
46-
47-
unsafe { intrinsics::abort() }
48-
}
49-
50-
#[cfg(not(stage0))]
5136
#[cold] #[inline(never)] // this is the slow path, always
5237
#[lang="fail"]
5338
fn fail(expr_file_line: &(&'static str, &'static str, uint)) -> ! {
@@ -79,14 +64,6 @@ pub fn fail_str(msg: &str, file: &(&'static str, uint)) -> ! {
7964
pub fn fail_fmt(fmt: &fmt::Arguments, file_line: &(&'static str, uint)) -> ! {
8065
#[allow(ctypes)]
8166
extern {
82-
83-
// NOTE: remove after next snapshot
84-
#[cfg(stage0)]
85-
#[lang = "begin_unwind"]
86-
fn fail_impl(fmt: &fmt::Arguments, file: &'static str,
87-
line: uint) -> !;
88-
89-
#[cfg(not(stage0))]
9067
#[lang = "fail_fmt"]
9168
fn fail_impl(fmt: &fmt::Arguments, file: &'static str,
9269
line: uint) -> !;

src/librustc/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ This API is completely unstable and subject to change.
3232
#![feature(macro_rules, globs, struct_variant, quote)]
3333
#![feature(default_type_params, phase, unsafe_destructor)]
3434

35-
#![allow(unknown_features)] // NOTE: Remove after next snapshot
3635
#![feature(rustc_diagnostic_macros)]
3736
#![feature(import_shadowing)]
3837

src/librustrt/unwind.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -488,22 +488,13 @@ pub mod eabi {
488488
}
489489

490490
// Entry point of failure from the libcore crate
491-
#[cfg(not(test), not(stage0))]
491+
#[cfg(not(test))]
492492
#[lang = "fail_fmt"]
493493
pub extern fn rust_begin_unwind(msg: &fmt::Arguments,
494494
file: &'static str, line: uint) -> ! {
495495
begin_unwind_fmt(msg, &(file, line))
496496
}
497497

498-
//
499-
// Entry point of failure from the libcore crate
500-
#[cfg(stage0, not(test))]
501-
#[lang = "begin_unwind"]
502-
pub extern fn rust_begin_unwind(msg: &fmt::Arguments,
503-
file: &'static str, line: uint) -> ! {
504-
begin_unwind_fmt(msg, &(file, line))
505-
}
506-
507498
/// The entry point for unwinding with a formatted message.
508499
///
509500
/// This is designed to reduce the amount of code required at the call

src/snapshots.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
S 2014-09-28 7eb9337
2+
freebsd-x86_64 d45e0edd44f40a976ea0affaadd98732684cfca0
3+
linux-i386 3acb35755aa62b7ff78f76007d9a70696fce7aa7
4+
linux-x86_64 2615b67b700ae8f7d8d87c043207a1a6e2339389
5+
macos-i386 5eb4552dc66a14e1eff6e806a8ba27f4a73bb02a
6+
macos-x86_64 c6052632443f638f5024ae38f33ae2c80d8b18bd
7+
winnt-i386 269f46347b5766bff6f888c4307d50c475d3fe0f
8+
winnt-x86_64 06f89825cecda7f2e36a4660ffe6d2d4a0430ab4
9+
110
S 2014-09-22 437179e
211
freebsd-x86_64 f693c0441de3dbb2d471dde5a5045ac8a48807d8
312
linux-i386 5c2132b65f45c21b43d28de6a9460978b1a7b08a

0 commit comments

Comments
 (0)