about summary refs log tree commit diff
path: root/src/libstd/io
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-03-20 23:16:47 +0000
committerbors <bors@rust-lang.org>2015-03-20 23:16:47 +0000
commite2fa53e593a854a609ae9efe5a1bbe15265f0a6f (patch)
tree31d6cf6dcb795deb1b8bda95d58cfbf02002000b /src/libstd/io
parent68d69415637186755482d2584e6ba82b67bc1d89 (diff)
parentb4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e (diff)
downloadrust-e2fa53e593a854a609ae9efe5a1bbe15265f0a6f.tar.gz
rust-e2fa53e593a854a609ae9efe5a1bbe15265f0a6f.zip
Auto merge of #23512 - oli-obk:result_ok_unwrap, r=alexcrichton
because then the call to `unwrap()` will not print the error object.
Diffstat (limited to 'src/libstd/io')
-rw-r--r--src/libstd/io/cursor.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/io/cursor.rs b/src/libstd/io/cursor.rs
index 365f5e37b0b..87e5a2a4488 100644
--- a/src/libstd/io/cursor.rs
+++ b/src/libstd/io/cursor.rs
@@ -277,7 +277,7 @@ mod tests {
     fn read_to_end() {
         let mut reader = Cursor::new(vec!(0, 1, 2, 3, 4, 5, 6, 7));
         let mut v = Vec::new();
-        reader.read_to_end(&mut v).ok().unwrap();
+        reader.read_to_end(&mut v).unwrap();
         assert_eq!(v, [0, 1, 2, 3, 4, 5, 6, 7]);
     }