rollup merge of #21457: alexcrichton/issue-21436

[rust.git] / src / libstd / io / mem.rs

diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs
index 8d3c4f3053bef2119c719fb3dc284cc14a1bf68b..afa149f962f8379fad38e564af8bebe4cca3ea7a 100644 (file)
--- a/src/libstd/io/mem.rs
+++ b/src/libstd/io/mem.rs
@@ -432,8 +432,8 @@ fn test_buf_writer() {
             writer.write(&[]).unwrap();
             assert_eq!(writer.tell(), Ok(8));
 
-            assert_eq!(writer.write(&[8, 9]).unwrap_err().kind, io::ShortWrite(1));
-            assert_eq!(writer.write(&[10]).unwrap_err().kind, io::EndOfFile);
+            assert_eq!(writer.write(&[8, 9]).err().unwrap().kind, io::ShortWrite(1));
+            assert_eq!(writer.write(&[10]).err().unwrap().kind, io::EndOfFile);
         }
         let b: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7, 8];
         assert_eq!(buf, b);