diff options
| author | Brian Anderson <banderson@mozilla.com> | 2015-02-19 21:05:35 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2015-03-02 16:12:46 -0800 |
| commit | 76e9fa63ba0b6d892aa880db9c8373ede3e67c03 (patch) | |
| tree | 5c932ad4ef0079ca1f4a8b3d0767f7e5984df2a5 /src/libstd/old_io | |
| parent | 2ca6eaedae9ec4bff2a63f81f473aba653e46ac5 (diff) | |
| download | rust-76e9fa63ba0b6d892aa880db9c8373ede3e67c03.tar.gz rust-76e9fa63ba0b6d892aa880db9c8373ede3e67c03.zip | |
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]
Diffstat (limited to 'src/libstd/old_io')
| -rw-r--r-- | src/libstd/old_io/mod.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libstd/old_io/mod.rs b/src/libstd/old_io/mod.rs index b82572fc089..728a5dac4e4 100644 --- a/src/libstd/old_io/mod.rs +++ b/src/libstd/old_io/mod.rs @@ -714,28 +714,28 @@ pub trait Reader { /// /// The number of bytes returned is system-dependent. fn read_le_uint(&mut self) -> IoResult<uint> { - self.read_le_uint_n(usize::BYTES).map(|i| i as uint) + self.read_le_uint_n(usize::BYTES as usize).map(|i| i as uint) } /// Reads a little-endian integer. /// /// The number of bytes returned is system-dependent. fn read_le_int(&mut self) -> IoResult<int> { - self.read_le_int_n(isize::BYTES).map(|i| i as int) + self.read_le_int_n(isize::BYTES as usize).map(|i| i as int) } /// Reads a big-endian unsigned integer. /// /// The number of bytes returned is system-dependent. fn read_be_uint(&mut self) -> IoResult<uint> { - self.read_be_uint_n(usize::BYTES).map(|i| i as uint) + self.read_be_uint_n(usize::BYTES as usize).map(|i| i as uint) } /// Reads a big-endian integer. /// /// The number of bytes returned is system-dependent. fn read_be_int(&mut self) -> IoResult<int> { - self.read_be_int_n(isize::BYTES).map(|i| i as int) + self.read_be_int_n(isize::BYTES as usize).map(|i| i as int) } /// Reads a big-endian `u64`. @@ -1098,25 +1098,25 @@ pub trait Writer { /// Write a little-endian uint (number of bytes depends on system). #[inline] fn write_le_uint(&mut self, n: uint) -> IoResult<()> { - extensions::u64_to_le_bytes(n as u64, usize::BYTES, |v| self.write_all(v)) + extensions::u64_to_le_bytes(n as u64, usize::BYTES as usize, |v| self.write_all(v)) } /// Write a little-endian int (number of bytes depends on system). #[inline] fn write_le_int(&mut self, n: int) -> IoResult<()> { - extensions::u64_to_le_bytes(n as u64, isize::BYTES, |v| self.write_all(v)) + extensions::u64_to_le_bytes(n as u64, isize::BYTES as usize, |v| self.write_all(v)) } /// Write a big-endian uint (number of bytes depends on system). #[inline] fn write_be_uint(&mut self, n: uint) -> IoResult<()> { - extensions::u64_to_be_bytes(n as u64, usize::BYTES, |v| self.write_all(v)) + extensions::u64_to_be_bytes(n as u64, usize::BYTES as usize, |v| self.write_all(v)) } /// Write a big-endian int (number of bytes depends on system). #[inline] fn write_be_int(&mut self, n: int) -> IoResult<()> { - extensions::u64_to_be_bytes(n as u64, isize::BYTES, |v| self.write_all(v)) + extensions::u64_to_be_bytes(n as u64, isize::BYTES as usize, |v| self.write_all(v)) } /// Write a big-endian u64 (8 bytes). |
