diff options
| author | est31 <MTest31@outlook.com> | 2016-11-20 01:26:51 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-12-30 15:17:27 +0100 |
| commit | 32d8d241599d8c72d23741db286e123a2f1cd7df (patch) | |
| tree | f2ac12b62a15bae863ab6e5fb4f75e35d8cbd26f /src/libcore/num | |
| parent | 5fd5d524b75d123eda841fbb86af1b5916b6081b (diff) | |
| download | rust-32d8d241599d8c72d23741db286e123a2f1cd7df.tar.gz rust-32d8d241599d8c72d23741db286e123a2f1cd7df.zip | |
Fix rebase fallout
Diffstat (limited to 'src/libcore/num')
| -rw-r--r-- | src/libcore/num/mod.rs | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 49e366a8976..61c687313dc 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -2614,6 +2614,27 @@ macro_rules! same_sign_try_from_int_impl { )*} } +#[cfg(stage0)] +same_sign_try_from_int_impl!(u64, u8, u8, u16, u32, u64, usize); +#[cfg(stage0)] +same_sign_try_from_int_impl!(i64, i8, i8, i16, i32, i64, isize); +#[cfg(stage0)] +same_sign_try_from_int_impl!(u64, u16, u8, u16, u32, u64, usize); +#[cfg(stage0)] +same_sign_try_from_int_impl!(i64, i16, i8, i16, i32, i64, isize); +#[cfg(stage0)] +same_sign_try_from_int_impl!(u64, u32, u8, u16, u32, u64, usize); +#[cfg(stage0)] +same_sign_try_from_int_impl!(i64, i32, i8, i16, i32, i64, isize); +#[cfg(stage0)] +same_sign_try_from_int_impl!(u64, u64, u8, u16, u32, u64, usize); +#[cfg(stage0)] +same_sign_try_from_int_impl!(i64, i64, i8, i16, i32, i64, isize); +#[cfg(stage0)] +same_sign_try_from_int_impl!(u64, usize, u8, u16, u32, u64, usize); +#[cfg(stage0)] +same_sign_try_from_int_impl!(i64, isize, i8, i16, i32, i64, isize); + #[cfg(not(stage0))] same_sign_try_from_int_impl!(u128, u8, u8, u16, u32, u64, u128, usize); #[cfg(not(stage0))] |