Skip to content
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

Minimize the implementation of Rem in libcore #28016

Merged
merged 2 commits into from
Aug 27, 2015
Merged

Minimize the implementation of Rem in libcore #28016

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
152c76e
Minimize the implementation of `Rem` in libcore
ranma42 Aug 24, 2015
4653a8b
Restore removed code and mark it for usage in stage0
ranma42 Aug 27, 2015
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
26 changes: 24 additions & 2 deletions src/libcore/ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ pub trait Rem<RHS=Self> {
fn rem(self, rhs: RHS) -> Self::Output;
}

macro_rules! rem_impl {
macro_rules! rem_impl_integer {
($($t:ty)*) => ($(
/// This operation satisfies `n % d == n - (n / d) * d`. The
/// result has the same sign as the left operand.
Expand All @@ -439,9 +439,28 @@ macro_rules! rem_impl {
)*)
}

rem_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 }
rem_impl_integer! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 }

#[cfg(not(stage0))]
macro_rules! rem_impl_float {
($($t:ty)*) => ($(
#[stable(feature = "rust1", since = "1.0.0")]
impl Rem for $t {
type Output = $t;

#[inline]
fn rem(self, other: $t) -> $t { self % other }
}

forward_ref_binop! { impl Rem, rem for $t, $t }
)*)
}

#[cfg(not(stage0))]
rem_impl_float! { f32 f64 }

#[stable(feature = "rust1", since = "1.0.0")]
#[cfg(stage0)]
impl Rem for f32 {
type Output = f32;

Expand All @@ -463,6 +482,7 @@ impl Rem for f32 {
}

#[stable(feature = "rust1", since = "1.0.0")]
#[cfg(stage0)]
impl Rem for f64 {
type Output = f64;

Expand All @@ -473,7 +493,9 @@ impl Rem for f64 {
}
}

#[cfg(stage0)]
forward_ref_binop! { impl Rem, rem for f64, f64 }
#[cfg(stage0)]
forward_ref_binop! { impl Rem, rem for f32, f32 }

/// The `Neg` trait is used to specify the functionality of unary `-`.
Expand Down