Skip to content

Commit 5720f70

Browse files
committed
Register new snapshots (2015-07-26 a5c12f4).
1 parent cf7e825 commit 5720f70

File tree

6 files changed

+14
-22
lines changed

6 files changed

+14
-22
lines changed

src/liballoc/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@
7070
test(no_crate_inject))]
7171
#![no_std]
7272

73-
// SNAP d4432b3
74-
#![allow(unused_features)] // until feature(placement_in_syntax) is in snap
7573
#![feature(allocator)]
7674
#![feature(box_syntax)]
7775
#![feature(coerce_unsized)]

src/libcore/intrinsics.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -184,19 +184,11 @@ extern "rust-intrinsic" {
184184
/// elements.
185185
pub fn size_of<T>() -> usize;
186186

187-
#[cfg(not(stage0))]
188187
/// Moves a value to an uninitialized memory location.
189188
///
190189
/// Drop glue is not run on the destination.
191190
pub fn move_val_init<T>(dst: *mut T, src: T);
192191

193-
// SNAP d4432b3
194-
#[cfg(stage0)]
195-
/// Moves a value to an uninitialized memory location.
196-
///
197-
/// Drop glue is not run on the destination.
198-
pub fn move_val_init<T>(dst: &mut T, src: T);
199-
200192
pub fn min_align_of<T>() -> usize;
201193
pub fn pref_align_of<T>() -> usize;
202194

@@ -614,6 +606,5 @@ extern "rust-intrinsic" {
614606
/// Rust's "try catch" construct which invokes the function pointer `f` with
615607
/// the data pointer `data`, returning the exception payload if an exception
616608
/// is thrown (aka the thread panics).
617-
#[cfg(not(stage0))]
618609
pub fn try(f: fn(*mut u8), data: *mut u8) -> *mut u8;
619610
}

src/libstd/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@
203203
test(no_crate_inject, attr(deny(warnings))),
204204
test(attr(allow(dead_code, deprecated, unused_variables, unused_mut))))]
205205

206-
#![cfg_attr(stage0, allow(unused_features))]
207206
#![feature(alloc)]
208207
#![feature(allow_internal_unstable)]
209208
#![feature(associated_consts)]

src/libstd/rt/unwind/gcc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ pub mod eabi {
115115
}
116116
}
117117

118-
#[cfg_attr(not(stage0), lang = "eh_personality_catch")]
118+
#[lang = "eh_personality_catch"]
119119
#[no_mangle]
120120
pub extern fn rust_eh_personality_catch(
121121
_version: c_int,
@@ -168,7 +168,7 @@ pub mod eabi {
168168
}
169169
}
170170

171-
#[cfg_attr(not(stage0), lang = "eh_personality_catch")]
171+
#[lang = "eh_personality_catch"]
172172
#[no_mangle]
173173
pub extern fn rust_eh_personality_catch(
174174
_version: c_int,
@@ -218,7 +218,7 @@ pub mod eabi {
218218
}
219219
}
220220

221-
#[cfg_attr(not(stage0), lang = "eh_personality_catch")]
221+
#[lang = "eh_personality_catch"]
222222
#[no_mangle]
223223
pub extern fn rust_eh_personality_catch(
224224
state: uw::_Unwind_State,
@@ -307,7 +307,7 @@ pub mod eabi {
307307
}
308308
}
309309

310-
#[cfg_attr(not(stage0), lang = "eh_personality_catch")]
310+
#[lang = "eh_personality_catch"]
311311
#[no_mangle]
312312
pub extern fn rust_eh_personality_catch(
313313
exceptionRecord: *mut EXCEPTION_RECORD,

src/libstd/rt/unwind/mod.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ pub unsafe fn try<F: FnOnce()>(f: F) -> Result<(), Box<Any + Send>> {
139139
// `dllexport`, but it's easier to not have conditional `src/rt/rust_try.ll`
140140
// files and instead just have this non-generic shim the compiler can take
141141
// care of exposing correctly.
142-
#[cfg(not(stage0))]
143142
unsafe fn inner_try(f: fn(*mut u8), data: *mut u8)
144143
-> Result<(), Box<Any + Send>> {
145144
let prev = PANICKING.with(|s| s.get());
@@ -152,11 +151,6 @@ pub unsafe fn try<F: FnOnce()>(f: F) -> Result<(), Box<Any + Send>> {
152151
Err(imp::cleanup(ep))
153152
}
154153
}
155-
#[cfg(stage0)]
156-
unsafe fn inner_try(f: fn(*mut u8), data: *mut u8)
157-
-> Result<(), Box<Any + Send>> {
158-
Ok(f(data))
159-
}
160154

161155
fn try_fn<F: FnOnce()>(opt_closure: *mut u8) {
162156
let opt_closure = opt_closure as *mut Option<F>;

src/snapshots.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
S 2015-07-26 a5c12f4
2+
bitrig-x86_64 8734eb41ffbe6ddc1120aa2910db4162ec9cf270
3+
freebsd-x86_64 bc50b0f8d7f6d62f4f5ffa136f5387f5bf6524fd
4+
linux-i386 3459275cdf3896f678e225843fa56f0d9fdbabe8
5+
linux-x86_64 e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c
6+
macos-i386 428944a7984c0988e77909d82ca2ef77d96a1fbd
7+
macos-x86_64 b0515bb7d2892b9a58282fc865fee11a885406d6
8+
winnt-i386 22286e815372c3e03729853af48a2f6d538ed086
9+
winnt-x86_64 f13aa3c02a15f8e794b9e180487bdf04378f8f04
10+
111
S 2015-07-17 d4432b3
212
bitrig-x86_64 af77768e0eb0f4c7ec5a8e36047a08053b54b230
313
freebsd-i386 b049325e5b2efe5f4884f3dafda448c1dac49b4f

0 commit comments

Comments
 (0)