diff options
| author | bors <bors@rust-lang.org> | 2015-03-05 21:03:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-05 21:03:10 +0000 |
| commit | b0746ff19b3bc204215f04bbb5756159f9bc5c92 (patch) | |
| tree | 2116c5865229d3d238832e50c99ad9baebe63087 /src/libstd/sys | |
| parent | f0c74f85f363a8081b31f9ab696463717ce312d5 (diff) | |
| parent | 340d1cc7d701bf1c5bae6c2ad5b097462c5d1a7c (diff) | |
| download | rust-b0746ff19b3bc204215f04bbb5756159f9bc5c92.tar.gz rust-b0746ff19b3bc204215f04bbb5756159f9bc5c92.zip | |
Auto merge of #23031 - Manishearth:rollup, r=Manishearth
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/wtf8.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/unix/fs.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/common/wtf8.rs b/src/libstd/sys/common/wtf8.rs index 31bdaee1e34..719c74179ac 100644 --- a/src/libstd/sys/common/wtf8.rs +++ b/src/libstd/sys/common/wtf8.rs @@ -714,7 +714,7 @@ pub fn is_code_point_boundary(slice: &Wtf8, index: uint) -> bool { if index == slice.len() { return true; } match slice.bytes.get(index) { None => false, - Some(&b) => b < 128u8 || b >= 192u8, + Some(&b) => b < 128 || b >= 192, } } @@ -776,7 +776,7 @@ impl<'a> Iterator for EncodeWide<'a> { return Some(tmp); } - let mut buf = [0u16; 2]; + let mut buf = [0; 2]; self.code_points.next().map(|code_point| { let n = encode_utf16_raw(code_point.value, &mut buf) .unwrap_or(0); diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index 71b6214460f..3d490380bfd 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -389,7 +389,7 @@ mod tests { let mut writer = FileDesc::new(writer, true); writer.write(b"test").ok().unwrap(); - let mut buf = [0u8; 4]; + let mut buf = [0; 4]; match reader.read(&mut buf) { Ok(4) => { assert_eq!(buf[0], 't' as u8); |
