diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-30 12:03:24 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-30 12:03:24 -0800 |
| commit | ebee4b4b37bc860accb8ad41946edfd5acdfc6a8 (patch) | |
| tree | 1e74f77e2bb6976eb152772989041086433a10c2 /src/libstd | |
| parent | f8b3d5c2dbf8eced6a876269574afb3075b768ec (diff) | |
| parent | 26276f475134ca58a9872e175f964e4512f75d1a (diff) | |
| download | rust-ebee4b4b37bc860accb8ad41946edfd5acdfc6a8.tar.gz rust-ebee4b4b37bc860accb8ad41946edfd5acdfc6a8.zip | |
rollup merge of #21736: sfackler/bufread-capacity-fix
We don't care about how much space the allocation has, but the actual usable space in the buffer. r? @alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/old_io/buffered.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/old_io/buffered.rs b/src/libstd/old_io/buffered.rs index 1590598c0b8..586cc1477f8 100644 --- a/src/libstd/old_io/buffered.rs +++ b/src/libstd/old_io/buffered.rs @@ -111,7 +111,7 @@ impl<R: Reader> Buffer for BufferedReader<R> { impl<R: Reader> Reader for BufferedReader<R> { fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> { - if self.pos == self.cap && buf.len() >= self.buf.capacity() { + if self.pos == self.cap && buf.len() >= self.buf.len() { return self.inner.read(buf); } let nread = { |