diff options
| author | bors <bors@rust-lang.org> | 2015-03-09 00:17:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-09 00:17:49 +0000 |
| commit | 91bdf23f504f79ed59617cde3dfebd3d5e39a476 (patch) | |
| tree | 3361c261cea51cef35f4c846aecfe4f3c078a124 /src | |
| parent | d71239f628f0338d042a7f2cd6f5909025cb0509 (diff) | |
| parent | f81f8d81d3d0f0bea7d6b6b0db3586457962435a (diff) | |
| download | rust-91bdf23f504f79ed59617cde3dfebd3d5e39a476.tar.gz rust-91bdf23f504f79ed59617cde3dfebd3d5e39a476.zip | |
Auto merge of #23153 - Manishearth:snap, r=alexcrichton
Needed so that #21824 can land
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/intrinsics.rs | 4 | ||||
| -rw-r--r-- | src/libcore/num/wrapping.rs | 22 | ||||
| -rw-r--r-- | src/snapshots.txt | 9 |
3 files changed, 9 insertions, 26 deletions
diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs index c6fc8ba5867..7fccb93f2a0 100644 --- a/src/libcore/intrinsics.rs +++ b/src/libcore/intrinsics.rs @@ -545,11 +545,7 @@ extern "rust-intrinsic" { pub fn u32_mul_with_overflow(x: u32, y: u32) -> (u32, bool); /// Performs checked `u64` multiplication. pub fn u64_mul_with_overflow(x: u64, y: u64) -> (u64, bool); -} -// SNAP 880fb89 -#[cfg(not(stage0))] -extern "rust-intrinsic" { /// Returns (a + b) mod 2^N, where N is the width of N in bits. pub fn overflowing_add<T>(a: T, b: T) -> T; /// Returns (a - b) mod 2^N, where N is the width of N in bits. diff --git a/src/libcore/num/wrapping.rs b/src/libcore/num/wrapping.rs index 707e41a948b..f8fc4ef27a1 100644 --- a/src/libcore/num/wrapping.rs +++ b/src/libcore/num/wrapping.rs @@ -11,7 +11,6 @@ use ops::*; -#[cfg(not(stage0))] use intrinsics::{overflowing_add, overflowing_sub, overflowing_mul}; use intrinsics::{i8_add_with_overflow, u8_add_with_overflow}; @@ -40,7 +39,6 @@ pub trait OverflowingOps { fn overflowing_mul(self, rhs: Self) -> (Self, bool); } -#[cfg(not(stage0))] macro_rules! wrapping_impl { ($($t:ty)*) => ($( impl WrappingOps for $t { @@ -66,26 +64,6 @@ macro_rules! wrapping_impl { )*) } -#[cfg(stage0)] -macro_rules! wrapping_impl { - ($($t:ty)*) => ($( - impl WrappingOps for $t { - #[inline(always)] - fn wrapping_add(self, rhs: $t) -> $t { - self + rhs - } - #[inline(always)] - fn wrapping_sub(self, rhs: $t) -> $t { - self - rhs - } - #[inline(always)] - fn wrapping_mul(self, rhs: $t) -> $t { - self * rhs - } - } - )*) -} - wrapping_impl! { uint u8 u16 u32 u64 int i8 i16 i32 i64 } #[unstable(feature = "core", reason = "may be removed, renamed, or relocated")] diff --git a/src/snapshots.txt b/src/snapshots.txt index 5e85e3dff6a..35f46ca6d32 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,12 @@ +S 2015-03-07 270a677 + freebsd-x86_64 3c147d8e4cfdcb02c2569f5aca689a1d8920d17b + linux-i386 50a47ef247610fb089d2c4f24e4b641eb0ba4afb + linux-x86_64 ccb20709b3c984f960ddde996451be8ce2268d7c + macos-i386 ad263bdeadcf9bf1889426e0c1391a7cf277364e + macos-x86_64 01c8275828042264206b7acd8e86dc719a2f27aa + winnt-i386 cb73ac7a9bf408e8b5cdb92d595082a537a90794 + winnt-x86_64 b9b47e80101f726ae4f5919373ea20b92d827f3c + S 2015-02-25 880fb89 bitrig-x86_64 8cdc4ca0a80103100f46cbf8caa9fe497df048c5 freebsd-x86_64 f4cbe4227739de986444211f8ee8d74745ab8f7f |