Skip to content

Register new snapshots (270a677) #23153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 9, 2015
Merged

Register new snapshots (270a677) #23153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/libcore/intrinsics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
22 changes: 0 additions & 22 deletions src/libcore/num/wrapping.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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 {
Expand All @@ -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")]
Expand Down
9 changes: 9 additions & 0 deletions src/snapshots.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down