diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-10-16 18:34:01 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-10-17 17:31:35 -0700 |
| commit | 34d376f3cf234dc714fcfab7639affd3967dc16d (patch) | |
| tree | 780dbbd084e9a57689e2565a2e1b3541a350eb86 /src/libstd/num/uint.rs | |
| parent | 3fd0e3a77be624f41647bb930843de27bc1cc985 (diff) | |
| download | rust-34d376f3cf234dc714fcfab7639affd3967dc16d.tar.gz rust-34d376f3cf234dc714fcfab7639affd3967dc16d.zip | |
std: Move size/align functions to std::mem. #2240
Diffstat (limited to 'src/libstd/num/uint.rs')
| -rw-r--r-- | src/libstd/num/uint.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/num/uint.rs b/src/libstd/num/uint.rs index 38a4df270fc..2ecbb79407e 100644 --- a/src/libstd/num/uint.rs +++ b/src/libstd/num/uint.rs @@ -14,7 +14,7 @@ use num; use num::{CheckedAdd, CheckedSub, CheckedMul}; use option::{Option, Some, None}; use unstable::intrinsics; -use sys; +use mem; pub use self::generated::*; @@ -97,7 +97,7 @@ impl num::Times for uint { /// Returns the smallest power of 2 greater than or equal to `n` #[inline] pub fn next_power_of_two(n: uint) -> uint { - let halfbits: uint = sys::size_of::<uint>() * 4u; + let halfbits: uint = mem::size_of::<uint>() * 4u; let mut tmp: uint = n - 1u; let mut shift: uint = 1u; while shift <= halfbits { tmp |= tmp >> shift; shift <<= 1u; } @@ -107,7 +107,7 @@ pub fn next_power_of_two(n: uint) -> uint { /// Returns the smallest power of 2 greater than or equal to `n` #[inline] pub fn next_power_of_two_opt(n: uint) -> Option<uint> { - let halfbits: uint = sys::size_of::<uint>() * 4u; + let halfbits: uint = mem::size_of::<uint>() * 4u; let mut tmp: uint = n - 1u; let mut shift: uint = 1u; while shift <= halfbits { tmp |= tmp >> shift; shift <<= 1u; } |
