diff options
| author | bors <bors@rust-lang.org> | 2014-04-08 15:06:31 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-04-08 15:06:31 -0700 |
| commit | 8801d891c4674f335fcdc67cb34237902d89a5ec (patch) | |
| tree | 1b9895a11226fa2112b37a48a48190bb58dc74ab /src/libstd | |
| parent | 02f51211eddbbaf6c6e02cecc78957ce1d5b4600 (diff) | |
| parent | 7619b781913c7f68d7e8eae6d08d81208d551560 (diff) | |
| download | rust-8801d891c4674f335fcdc67cb34237902d89a5ec.tar.gz rust-8801d891c4674f335fcdc67cb34237902d89a5ec.zip | |
auto merge of #13399 : SimonSapin/rust/patch-8, r=cmr
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/mem.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index 1cf6ed9a5d9..b6d1b627b70 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -237,7 +237,7 @@ impl<'a> BufWriter<'a> { impl<'a> Writer for BufWriter<'a> { fn write(&mut self, buf: &[u8]) -> IoResult<()> { - // raises a condition if the entire write does not fit in the buffer + // return an error if the entire write does not fit in the buffer let max_size = self.buf.len(); if self.pos >= max_size || (self.pos + buf.len()) > max_size { return Err(IoError { |