Skip to content

Allow any integral type to be used as Shr and Shl RHS #20942

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
Jan 12, 2015
Merged

Allow any integral type to be used as Shr and Shl RHS #20942

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
68 changes: 60 additions & 8 deletions src/libcore/ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,20 +706,45 @@ pub trait Shl<RHS> {
}

macro_rules! shl_impl {
($($t:ty)*) => ($(
($t:ty, $f:ty) => (
#[stable]
impl Shl<uint> for $t {
impl Shl<$f> for $t {
type Output = $t;

#[inline]
fn shl(self, other: uint) -> $t {
fn shl(self, other: $f) -> $t {
self << other
}
}
)
}

// SNAP 9e4e524e0
#[cfg(not(stage0))]
macro_rules! shl_impl_all {
($($t:ty)*) => ($(
shl_impl! { $t, u8 }
shl_impl! { $t, u16 }
shl_impl! { $t, u32 }
shl_impl! { $t, u64 }
shl_impl! { $t, usize }

shl_impl! { $t, i8 }
shl_impl! { $t, i16 }
shl_impl! { $t, i32 }
shl_impl! { $t, i64 }
shl_impl! { $t, isize }
)*)
}

shl_impl! { uint u8 u16 u32 u64 int i8 i16 i32 i64 }
#[cfg(stage0)]
macro_rules! shl_impl_all {
($($t:ty)*) => ($(
shl_impl! { $t, usize }
)*)
}

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

/// The `Shr` trait is used to specify the functionality of `>>`.
///
Expand Down Expand Up @@ -761,17 +786,44 @@ pub trait Shr<RHS> {
}

macro_rules! shr_impl {
($($t:ty)*) => ($(
impl Shr<uint> for $t {
($t:ty, $f:ty) => (
impl Shr<$f> for $t {
type Output = $t;

#[inline]
fn shr(self, other: uint) -> $t { self >> other }
fn shr(self, other: $f) -> $t {
self >> other
}
}
)
}

// SNAP 9e4e524e0
#[cfg(not(stage0))]
macro_rules! shr_impl_all {
($($t:ty)*) => ($(
shr_impl! { $t, u8 }
shr_impl! { $t, u16 }
shr_impl! { $t, u32 }
shr_impl! { $t, u64 }
shr_impl! { $t, usize }

shr_impl! { $t, i8 }
shr_impl! { $t, i16 }
shr_impl! { $t, i32 }
shr_impl! { $t, i64 }
shr_impl! { $t, isize }
)*)
}

#[cfg(stage0)]
macro_rules! shr_impl_all {
($($t:ty)*) => ($(
shr_impl! { $t, usize }
)*)
}

shr_impl! { uint u8 u16 u32 u64 int i8 i16 i32 i64 }
shr_impl_all! { u8 u16 u32 u64 usize i8 i16 i32 i64 isize }

/// The `Index` trait is used to specify the functionality of indexing operations
/// like `arr[idx]` when used in an immutable context.
Expand Down