summary refs log tree commit diff
path: root/src/libstd/io/buffered.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-31 16:18:55 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-03-31 16:18:55 -0700
commit50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681 (patch)
tree0546f83f5625d11fc4d5d9b2ad215a4ac3ce4778 /src/libstd/io/buffered.rs
parent85e997adfffa5e8511ff31710649038216028832 (diff)
parentac77392f8ab1c201b0c927f6a2d30b632b95acda (diff)
downloadrust-50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681.tar.gz
rust-50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681.zip
rollup merge of #23919: alexcrichton/stabilize-io-error
Conflicts:
	src/libstd/fs/tempdir.rs
	src/libstd/io/error.rs
Diffstat (limited to 'src/libstd/io/buffered.rs')
-rw-r--r--src/libstd/io/buffered.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs
index 628ad839c16..479665c4728 100644
--- a/src/libstd/io/buffered.rs
+++ b/src/libstd/io/buffered.rs
@@ -165,7 +165,7 @@ impl<W: Write> BufWriter<W> {
             match self.inner.as_mut().unwrap().write(&self.buf[written..]) {
                 Ok(0) => {
                     ret = Err(Error::new(ErrorKind::WriteZero,
-                                         "failed to write the buffered data", None));
+                                         "failed to write the buffered data"));
                     break;
                 }
                 Ok(n) => written += n,