diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-04-01 16:34:15 -0700 |
|---|---|---|
| committer | Felix S. Klock II <pnkfelix@pnkfx.org> | 2015-04-02 02:07:51 +0200 |
| commit | f86318d63c86568b312f39da20bea67e328c1fc5 (patch) | |
| tree | 36c7d66caea7d71f389adb2583d1fae252327e49 /src/libstd | |
| parent | 07ff8ab8855b4d5ce0d547cfe3b1bf03e5f427eb (diff) | |
| download | rust-f86318d63c86568b312f39da20bea67e328c1fc5.tar.gz rust-f86318d63c86568b312f39da20bea67e328c1fc5.zip | |
Test fixes and rebase conflicts, round 2
Conflicts: src/libcore/num/mod.rs
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_io/fs.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 4f97ae8f69b..eabc51beb12 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -946,7 +946,7 @@ mod tests { let mut read_stream = check!(File::open(filename)); let mut read_buf = [0; 1028]; let read_str = match check!(read_stream.read(&mut read_buf)) { - -1|0 => panic!("shouldn't happen"), + 0 => panic!("shouldn't happen"), n => str::from_utf8(&read_buf[..n]).unwrap().to_string() }; assert_eq!(read_str, message); diff --git a/src/libstd/old_io/fs.rs b/src/libstd/old_io/fs.rs index bef6ea53e50..509daa46ef3 100644 --- a/src/libstd/old_io/fs.rs +++ b/src/libstd/old_io/fs.rs @@ -970,7 +970,7 @@ mod test { let mut read_stream = File::open_mode(filename, Open, Read); let mut read_buf = [0; 1028]; let read_str = match check!(read_stream.read(&mut read_buf)) { - -1|0 => panic!("shouldn't happen"), + 0 => panic!("shouldn't happen"), n => str::from_utf8(&read_buf[..n]).unwrap().to_string() }; assert_eq!(read_str, message); |