From 76e9fa63ba0b6d892aa880db9c8373ede3e67c03 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 19 Feb 2015 21:05:35 -0800 Subject: core: Audit num module for int/uint * count_ones/zeros, trailing_ones/zeros return u32, not usize * rotate_left/right take u32, not usize * RADIX, MANTISSA_DIGITS, DIGITS, BITS, BYTES are u32, not usize Doesn't touch pow because there's another PR for it. [breaking-change] --- src/libcollections/enum_set.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libcollections/enum_set.rs') diff --git a/src/libcollections/enum_set.rs b/src/libcollections/enum_set.rs index 62dd9191521..4c966c0d44b 100644 --- a/src/libcollections/enum_set.rs +++ b/src/libcollections/enum_set.rs @@ -78,7 +78,7 @@ pub trait CLike { fn bit(e: &E) -> usize { use core::usize; let value = e.to_usize(); - assert!(value < usize::BITS, + assert!(value < usize::BITS as usize, "EnumSet only supports up to {} variants.", usize::BITS - 1); 1 << value } @@ -95,7 +95,7 @@ impl EnumSet { #[unstable(feature = "collections", reason = "matches collection reform specification, waiting for dust to settle")] pub fn len(&self) -> usize { - self.bits.count_ones() + self.bits.count_ones() as usize } /// Returns true if the `EnumSet` is empty. @@ -250,7 +250,7 @@ impl Iterator for Iter { } fn size_hint(&self) -> (usize, Option) { - let exact = self.bits.count_ones(); + let exact = self.bits.count_ones() as usize; (exact, Some(exact)) } } -- cgit 1.4.1-3-g733a5