diff options
| author | bors <bors@rust-lang.org> | 2014-01-07 01:51:39 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-07 01:51:39 -0800 |
| commit | bc395bc71e02a7726565725ce026758f948b2d76 (patch) | |
| tree | 86576b45e6b489f635fdca29bc4687c7ebd3be96 /src/libstd/io | |
| parent | 777f1e8d24a5816a7ca1308ef4243201a6b81221 (diff) | |
| parent | 82365501043735dd8ec5eadaa5d30354cee19252 (diff) | |
| download | rust-bc395bc71e02a7726565725ce026758f948b2d76.tar.gz rust-bc395bc71e02a7726565725ce026758f948b2d76.zip | |
auto merge of #11329 : fhahn/rust/unused-cast-lint2, r=alexcrichton
Updates as mentioned in #11135
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/mod.rs | 10 | ||||
| -rw-r--r-- | src/libstd/io/net/ip.rs | 6 | ||||
| -rw-r--r-- | src/libstd/io/stdio.rs | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index b7e185f8ed5..823ca80a8a1 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -725,7 +725,7 @@ pub trait Reader { /// /// `u64`s are 8 bytes long. fn read_be_u64(&mut self) -> u64 { - self.read_be_uint_n(8) as u64 + self.read_be_uint_n(8) } /// Reads a big-endian `u32`. @@ -746,7 +746,7 @@ pub trait Reader { /// /// `i64`s are 8 bytes long. fn read_be_i64(&mut self) -> i64 { - self.read_be_int_n(8) as i64 + self.read_be_int_n(8) } /// Reads a big-endian `i32`. @@ -785,7 +785,7 @@ pub trait Reader { /// /// `u64`s are 8 bytes long. fn read_le_u64(&mut self) -> u64 { - self.read_le_uint_n(8) as u64 + self.read_le_uint_n(8) } /// Reads a little-endian `u32`. @@ -806,7 +806,7 @@ pub trait Reader { /// /// `i64`s are 8 bytes long. fn read_le_i64(&mut self) -> i64 { - self.read_le_int_n(8) as i64 + self.read_le_int_n(8) } /// Reads a little-endian `i32`. @@ -846,7 +846,7 @@ pub trait Reader { /// `u8`s are 1 byte. fn read_u8(&mut self) -> u8 { match self.read_byte() { - Some(b) => b as u8, + Some(b) => b, None => 0 } } diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs index b4d14b57efc..9fd183ca770 100644 --- a/src/libstd/io/net/ip.rs +++ b/src/libstd/io/net/ip.rs @@ -153,11 +153,11 @@ impl<'a> Parser<'a> { let c = c as u8; // assuming radix is either 10 or 16 if c >= '0' as u8 && c <= '9' as u8 { - Some((c - '0' as u8) as u8) + Some(c - '0' as u8) } else if radix > 10 && c >= 'a' as u8 && c < 'a' as u8 + (radix - 10) { - Some((c - 'a' as u8 + 10) as u8) + Some(c - 'a' as u8 + 10) } else if radix > 10 && c >= 'A' as u8 && c < 'A' as u8 + (radix - 10) { - Some((c - 'A' as u8 + 10) as u8) + Some(c - 'A' as u8 + 10) } else { None } diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index 1e4fa7968dc..1fcafd7d12f 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -209,7 +209,7 @@ impl Reader for StdReader { io_error::cond.raise(standard_error(EndOfFile)); None } - Ok(amt) => Some(amt as uint), + Ok(amt) => Some(amt), Err(e) => { io_error::cond.raise(e); None |
