diff options
| author | bors <bors@rust-lang.org> | 2017-07-25 16:13:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-25 16:13:16 +0000 |
| commit | c417ee9ae8c30ac307c58591da46cf62e91caac1 (patch) | |
| tree | 8de4b9605fb1ef3b5ddb0ff1ff8277b6981b7f3a /src/libcore/num | |
| parent | a643bdc681120446e3f5b787ae009bfa6b5f01b6 (diff) | |
| parent | 9010567dcc0aba772525841aee67c030ea3450c6 (diff) | |
| download | rust-c417ee9ae8c30ac307c58591da46cf62e91caac1.tar.gz rust-c417ee9ae8c30ac307c58591da46cf62e91caac1.zip | |
Auto merge of #43320 - alexcrichton:new-bootstrap, r=Mark-Simulacrum
Bump master to 1.21.0 This commit bumps the master branch's version to 1.21.0 and also updates the bootstrap compiler from the freshly minted beta release.
Diffstat (limited to 'src/libcore/num')
| -rw-r--r-- | src/libcore/num/mod.rs | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 0ebac027c39..185034a5313 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -2238,17 +2238,12 @@ macro_rules! uint_impl { } } -#[cfg(stage0)] -unsafe fn ctlz_nonzero<T>(x: T) -> T { intrinsics::ctlz(x) } -#[cfg(not(stage0))] -unsafe fn ctlz_nonzero<T>(x: T) -> T { intrinsics::ctlz_nonzero(x) } - #[lang = "u8"] impl u8 { uint_impl! { u8, u8, 8, intrinsics::ctpop, intrinsics::ctlz, - ctlz_nonzero, + intrinsics::ctlz_nonzero, intrinsics::cttz, intrinsics::bswap, intrinsics::add_with_overflow, @@ -2261,7 +2256,7 @@ impl u16 { uint_impl! { u16, u16, 16, intrinsics::ctpop, intrinsics::ctlz, - ctlz_nonzero, + intrinsics::ctlz_nonzero, intrinsics::cttz, intrinsics::bswap, intrinsics::add_with_overflow, @@ -2274,7 +2269,7 @@ impl u32 { uint_impl! { u32, u32, 32, intrinsics::ctpop, intrinsics::ctlz, - ctlz_nonzero, + intrinsics::ctlz_nonzero, intrinsics::cttz, intrinsics::bswap, intrinsics::add_with_overflow, @@ -2287,7 +2282,7 @@ impl u64 { uint_impl! { u64, u64, 64, intrinsics::ctpop, intrinsics::ctlz, - ctlz_nonzero, + intrinsics::ctlz_nonzero, intrinsics::cttz, intrinsics::bswap, intrinsics::add_with_overflow, @@ -2300,7 +2295,7 @@ impl u128 { uint_impl! { u128, u128, 128, intrinsics::ctpop, intrinsics::ctlz, - ctlz_nonzero, + intrinsics::ctlz_nonzero, intrinsics::cttz, intrinsics::bswap, intrinsics::add_with_overflow, @@ -2314,7 +2309,7 @@ impl usize { uint_impl! { usize, u16, 16, intrinsics::ctpop, intrinsics::ctlz, - ctlz_nonzero, + intrinsics::ctlz_nonzero, intrinsics::cttz, intrinsics::bswap, intrinsics::add_with_overflow, @@ -2327,7 +2322,7 @@ impl usize { uint_impl! { usize, u32, 32, intrinsics::ctpop, intrinsics::ctlz, - ctlz_nonzero, + intrinsics::ctlz_nonzero, intrinsics::cttz, intrinsics::bswap, intrinsics::add_with_overflow, @@ -2341,7 +2336,7 @@ impl usize { uint_impl! { usize, u64, 64, intrinsics::ctpop, intrinsics::ctlz, - ctlz_nonzero, + intrinsics::ctlz_nonzero, intrinsics::cttz, intrinsics::bswap, intrinsics::add_with_overflow, |