Skip to content

Commit c4a1c38

Browse files
committed
Register new snapshots
This is the first linux snapshot created on our new CentOS 5.10 builders. Closes #9545
1 parent 0e784e1 commit c4a1c38

File tree

3 files changed

+9
-36
lines changed

3 files changed

+9
-36
lines changed

src/liballoc/heap.rs

-29
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010

1111
// FIXME: #13996: mark the `allocate` and `reallocate` return value as `noalias`
1212

13-
#[cfg(stage0, not(test))] use core::raw;
14-
#[cfg(stage0, not(test))] use util;
15-
1613
/// Returns a pointer to `size` bytes of memory.
1714
///
1815
/// Behavior is undefined if the requested size is 0 or the alignment is not a
@@ -111,21 +108,6 @@ unsafe fn exchange_free(ptr: *mut u8, size: uint, align: uint) {
111108
deallocate(ptr, size, align);
112109
}
113110

114-
#[cfg(stage0, not(test))]
115-
#[lang="closure_exchange_malloc"]
116-
#[inline]
117-
#[allow(deprecated)]
118-
unsafe fn closure_exchange_malloc(drop_glue: fn(*mut u8), size: uint,
119-
align: uint) -> *mut u8 {
120-
let total_size = util::get_box_size(size, align);
121-
let p = allocate(total_size, 8);
122-
123-
let alloc = p as *mut raw::Box<()>;
124-
(*alloc).drop_glue = drop_glue;
125-
126-
alloc as *mut u8
127-
}
128-
129111
// The minimum alignment guaranteed by the architecture. This value is used to
130112
// add fast paths for low alignment values. In practice, the alignment is a
131113
// constant at the call site and the branch will be optimized out.
@@ -155,9 +137,6 @@ mod imp {
155137
flags: c_int) -> *mut c_void;
156138
fn je_xallocx(ptr: *mut c_void, size: size_t, extra: size_t,
157139
flags: c_int) -> size_t;
158-
#[cfg(stage0)]
159-
fn je_dallocx(ptr: *mut c_void, flags: c_int);
160-
#[cfg(not(stage0))]
161140
fn je_sdallocx(ptr: *mut c_void, size: size_t, flags: c_int);
162141
fn je_nallocx(size: size_t, flags: c_int) -> size_t;
163142
fn je_malloc_stats_print(write_cb: Option<extern "C" fn(cbopaque: *mut c_void,
@@ -209,14 +188,6 @@ mod imp {
209188
}
210189

211190
#[inline]
212-
#[cfg(stage0)]
213-
pub unsafe fn deallocate(ptr: *mut u8, _size: uint, align: uint) {
214-
let flags = align_to_flags(align);
215-
je_dallocx(ptr as *mut c_void, flags)
216-
}
217-
218-
#[inline]
219-
#[cfg(not(stage0))]
220191
pub unsafe fn deallocate(ptr: *mut u8, size: uint, align: uint) {
221192
let flags = align_to_flags(align);
222193
je_sdallocx(ptr as *mut c_void, size as size_t, flags)

src/libcore/fmt/rt.rs

-7
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414
//! These definitions are similar to their `ct` equivalents, but differ in that
1515
//! these can be statically allocated and are slightly optimized for the runtime
1616
17-
#[cfg(stage0)]
18-
#[doc(hidden)]
19-
pub enum Piece<'a> {
20-
String(&'a str),
21-
Argument(Argument<'a>),
22-
}
23-
2417
#[doc(hidden)]
2518
pub struct Argument<'a> {
2619
pub position: Position,

src/snapshots.txt

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
S 2014-09-16 828e075
2+
winnt-x86_64 ce1e9d7f6967bfa368853e7c968e1626cc319951
3+
winnt-i386 a8bd994666dfe683a5d7922c7998500255780724
4+
linux-x86_64 88ff474db96c6ffc5c1dc7a43442cbe1cd88c8a2
5+
linux-i386 7a731891f726c8a0590b142a4e8924c5e8b22e8d
6+
freebsd-x86_64 e67a56f76484f775cd4836dedb2d1069ab5d7921
7+
macos-i386 f48023648a77e89086f4a2b39d76b09e4fff032d
8+
macos-x86_64 2ad6457b2b3036f87eae7581d64ee5341a07fb06
9+
110
S 2014-09-10 6faa4f3
211
winnt-x86_64 939eb546469cb936441cff3b6f2478f562f77c46
312
winnt-i386 cfe4f8b519bb9d62588f9310a8f94bc919d5423b

0 commit comments

Comments
 (0)