From ee76be54861189275be483c3f4a72531dc7f7698 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Sat, 28 Mar 2015 16:07:25 +0300 Subject: Remove unnecessary `as usize` --- src/libstd/old_io/mod.rs | 16 ++++++++-------- src/libstd/sys/unix/c.rs | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/old_io/mod.rs b/src/libstd/old_io/mod.rs index df8ac78f7e5..e14a934d8dd 100644 --- a/src/libstd/old_io/mod.rs +++ b/src/libstd/old_io/mod.rs @@ -726,28 +726,28 @@ pub trait Reader { /// /// The number of bytes returned is system-dependent. fn read_le_uint(&mut self) -> IoResult { - self.read_le_uint_n(usize::BYTES as usize).map(|i| i as usize) + self.read_le_uint_n(usize::BYTES).map(|i| i as usize) } /// Reads a little-endian integer. /// /// The number of bytes returned is system-dependent. fn read_le_int(&mut self) -> IoResult { - self.read_le_int_n(isize::BYTES as usize).map(|i| i as isize) + self.read_le_int_n(isize::BYTES).map(|i| i as isize) } /// Reads a big-endian unsigned integer. /// /// The number of bytes returned is system-dependent. fn read_be_uint(&mut self) -> IoResult { - self.read_be_uint_n(usize::BYTES as usize).map(|i| i as usize) + self.read_be_uint_n(usize::BYTES).map(|i| i as usize) } /// Reads a big-endian integer. /// /// The number of bytes returned is system-dependent. fn read_be_int(&mut self) -> IoResult { - self.read_be_int_n(isize::BYTES as usize).map(|i| i as isize) + self.read_be_int_n(isize::BYTES).map(|i| i as isize) } /// Reads a big-endian `u64`. @@ -1110,25 +1110,25 @@ pub trait Writer { /// Write a little-endian usize (number of bytes depends on system). #[inline] fn write_le_uint(&mut self, n: usize) -> IoResult<()> { - extensions::u64_to_le_bytes(n as u64, usize::BYTES as usize, |v| self.write_all(v)) + extensions::u64_to_le_bytes(n as u64, usize::BYTES, |v| self.write_all(v)) } /// Write a little-endian isize (number of bytes depends on system). #[inline] fn write_le_int(&mut self, n: isize) -> IoResult<()> { - extensions::u64_to_le_bytes(n as u64, isize::BYTES as usize, |v| self.write_all(v)) + extensions::u64_to_le_bytes(n as u64, isize::BYTES, |v| self.write_all(v)) } /// Write a big-endian usize (number of bytes depends on system). #[inline] fn write_be_uint(&mut self, n: usize) -> IoResult<()> { - extensions::u64_to_be_bytes(n as u64, usize::BYTES as usize, |v| self.write_all(v)) + extensions::u64_to_be_bytes(n as u64, usize::BYTES, |v| self.write_all(v)) } /// Write a big-endian isize (number of bytes depends on system). #[inline] fn write_be_int(&mut self, n: isize) -> IoResult<()> { - extensions::u64_to_be_bytes(n as u64, isize::BYTES as usize, |v| self.write_all(v)) + extensions::u64_to_be_bytes(n as u64, isize::BYTES, |v| self.write_all(v)) } /// Write a big-endian u64 (8 bytes). diff --git a/src/libstd/sys/unix/c.rs b/src/libstd/sys/unix/c.rs index 2514d4bf4a3..5ae508e4610 100644 --- a/src/libstd/sys/unix/c.rs +++ b/src/libstd/sys/unix/c.rs @@ -194,12 +194,12 @@ mod select { #[repr(C)] pub struct fd_set { // FIXME: shouldn't this be a c_ulong? - fds_bits: [libc::uintptr_t; (FD_SETSIZE / usize::BITS as usize)] + fds_bits: [libc::uintptr_t; (FD_SETSIZE / usize::BITS)] } pub fn fd_set(set: &mut fd_set, fd: i32) { let fd = fd as usize; - set.fds_bits[fd / usize::BITS as usize] |= 1 << (fd % usize::BITS as usize); + set.fds_bits[fd / usize::BITS] |= 1 << (fd % usize::BITS); } } -- cgit 1.4.1-3-g733a5