diff options
| -rw-r--r-- | src/libcore/num/int-template/int.rs | 8 | ||||
| -rw-r--r-- | src/libcore/num/uint-template/uint.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/num/int-template/int.rs b/src/libcore/num/int-template/int.rs index c04e2a2e70d..7a44bfdf160 100644 --- a/src/libcore/num/int-template/int.rs +++ b/src/libcore/num/int-template/int.rs @@ -36,15 +36,15 @@ mod inst { impl BitCount for int { /// Counts the number of bits set. Wraps LLVM's `ctpop` intrinsic. #[inline(always)] - fn population_count(&self) -> int { (*self as i32).population_count() as uint } + fn population_count(&self) -> int { (*self as i32).population_count() as int } /// Counts the number of leading zeros. Wraps LLVM's `ctlz` intrinsic. #[inline(always)] - fn leading_zeros(&self) -> int { (*self as i32).leading_zeros() as uint } + fn leading_zeros(&self) -> int { (*self as i32).leading_zeros() as int } /// Counts the number of trailing zeros. Wraps LLVM's `cttz` intrinsic. #[inline(always)] - fn trailing_zeros(&self) -> int { (*self as i32).trailing_zeros() as uint } + fn trailing_zeros(&self) -> int { (*self as i32).trailing_zeros() as int } } #[cfg(target_word_size = "64")] @@ -60,7 +60,7 @@ mod inst { /// Counts the number of trailing zeros. Wraps LLVM's `cttz` intrinsic. #[inline(always)] - fn trailing_zeros(&self) -> int { (*self as i32).trailing_zeros() as int } + fn trailing_zeros(&self) -> int { (*self as i64).trailing_zeros() as int } } /// Returns `base` raised to the power of `exponent` diff --git a/src/libcore/num/uint-template/uint.rs b/src/libcore/num/uint-template/uint.rs index d333b0b58e1..6a8567451e6 100644 --- a/src/libcore/num/uint-template/uint.rs +++ b/src/libcore/num/uint-template/uint.rs @@ -74,7 +74,7 @@ pub mod inst { /// Counts the number of trailing zeros. Wraps LLVM's `cttz` intrinsic. #[inline(always)] - fn trailing_zeros(&self) -> uint { (*self as i32).trailing_zeros() as uint } + fn trailing_zeros(&self) -> uint { (*self as i64).trailing_zeros() as uint } } /// |