rollup merge of #21736: sfackler/bufread-capacity-fix

alexcrichton · alexcrichton · commit ebee4b4b37bc · 2015-01-30T12:03:24.000-08:00
We don't care about how much space the allocation has, but the actual usable space in the buffer. r? @alexcrichton
diff --git 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 = {

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ impl<R: Reader> Buffer for BufferedReader<R> {`
`111`	`111`
`112`	`112`	`impl<R: Reader> Reader for BufferedReader<R> {`
`113`	`113`	`fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> {`
`114`		`- if self.pos == self.cap && buf.len() >= self.buf.capacity() {`
	`114`	`+ if self.pos == self.cap && buf.len() >= self.buf.len() {`
`115`	`115`	`return self.inner.read(buf);`
`116`	`116`	`}`
`117`	`117`	`let nread = {`