Skip to content

Commit 9f74217

Browse files
committed
register snapshots
1 parent 34101d2 commit 9f74217

File tree

4 files changed

+9
-32
lines changed

4 files changed

+9
-32
lines changed

src/libstd/ptr.rs

-26
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
use cast;
1414
use clone::Clone;
1515
use option::{Option, Some, None};
16-
#[cfg(stage0)]
17-
use sys;
1816
use unstable::intrinsics;
1917
use util::swap;
2018

@@ -26,42 +24,18 @@ use uint;
2624

2725
/// Calculate the offset from a pointer
2826
#[inline]
29-
#[cfg(stage0)]
30-
pub fn offset<T>(ptr: *T, count: int) -> *T {
31-
(ptr as uint + (count as uint) * sys::size_of::<T>()) as *T
32-
}
33-
34-
/// Calculate the offset from a const pointer
35-
#[inline]
36-
#[cfg(stage0)]
37-
pub fn const_offset<T>(ptr: *const T, count: int) -> *const T {
38-
(ptr as uint + (count as uint) * sys::size_of::<T>()) as *T
39-
}
40-
41-
/// Calculate the offset from a mut pointer
42-
#[inline]
43-
#[cfg(stage0)]
44-
pub fn mut_offset<T>(ptr: *mut T, count: int) -> *mut T {
45-
(ptr as uint + (count as uint) * sys::size_of::<T>()) as *mut T
46-
}
47-
48-
/// Calculate the offset from a pointer
49-
#[inline]
50-
#[cfg(not(stage0))]
5127
pub fn offset<T>(ptr: *T, count: int) -> *T {
5228
unsafe { intrinsics::offset(ptr, count) }
5329
}
5430

5531
/// Calculate the offset from a const pointer
5632
#[inline]
57-
#[cfg(not(stage0))]
5833
pub fn const_offset<T>(ptr: *const T, count: int) -> *const T {
5934
unsafe { intrinsics::offset(ptr as *T, count) }
6035
}
6136

6237
/// Calculate the offset from a mut pointer
6338
#[inline]
64-
#[cfg(not(stage0))]
6539
pub fn mut_offset<T>(ptr: *mut T, count: int) -> *mut T {
6640
unsafe { intrinsics::offset(ptr as *T, count) as *mut T }
6741
}

src/libstd/unstable/atomics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ pub unsafe fn atomic_xor<T>(dst: &mut T, val: T, order: Ordering) -> T {
509509
*
510510
* Accepts `Acquire`, `Release`, `AcqRel` and `SeqCst` orderings.
511511
*/
512-
#[inline] #[cfg(not(stage0))]
512+
#[inline]
513513
pub fn fence(order: Ordering) {
514514
unsafe {
515515
match order {

src/libstd/unstable/intrinsics.rs

-5
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,9 @@ extern "rust-intrinsic" {
256256
pub fn atomic_umax_acqrel(dst: &mut int, src: int) -> int;
257257
pub fn atomic_umax_relaxed(dst: &mut int, src: int) -> int;
258258

259-
#[cfg(not(stage0))]
260259
pub fn atomic_fence();
261-
#[cfg(not(stage0))]
262260
pub fn atomic_fence_acq();
263-
#[cfg(not(stage0))]
264261
pub fn atomic_fence_rel();
265-
#[cfg(not(stage0))]
266262
pub fn atomic_fence_acqrel();
267263

268264
/// The size of a type in bytes.
@@ -325,7 +321,6 @@ extern "rust-intrinsic" {
325321
///
326322
/// This is implemented as an intrinsic to avoid converting to and from an
327323
/// integer, since the conversion would throw away aliasing information.
328-
#[cfg(not(stage0))]
329324
pub fn offset<T>(dst: *T, offset: int) -> *T;
330325

331326
/// Equivalent to the `llvm.memcpy.p0i8.0i8.i32` intrinsic, with a size of

src/snapshots.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2013-08-03 18e3db7
2+
freebsd-x86_64 addf91b20416bf21a7c53ea9508bc302ec957ce9
3+
linux-i386 ce103c323c0a0b75d1307014f1d6f8ff4d03c873
4+
linux-x86_64 6828d854d174c7b514a4350dfdd92c059df059d6
5+
macos-i386 ef4b67859146cacce54367f9243b5da9f9fde386
6+
macos-x86_64 936d4e170d8207b40df64c5eca3a3a27b3eee08a
7+
winnt-i386 332f0181fb68fcbeaaae342d5fb22889aa902152
8+
19
S 2013-07-31 389aba0
210
freebsd-x86_64 c9783bb5723404be8ae371d265bbb9a1c679e4db
311
linux-i386 7413d98325b23dc461ced92757e5e19bec750dbd

0 commit comments

Comments
 (0)