diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index ce14e5de90a6..c329fb3bfa50 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1446,7 +1446,7 @@ impl Read for Chain { impl BufRead for Chain { fn fill_buf(&mut self) -> Result<&[u8]> { if !self.done_first { - match try!(self.first.fill_buf()) { + match self.first.fill_buf()? { buf if buf.len() == 0 => { self.done_first = true; } buf => return Ok(buf), } @@ -1865,6 +1865,36 @@ mod tests { assert_eq!(0, R.take(0).read(&mut buf).unwrap()); } + fn cmp_bufread(mut br1: Br1, mut br2: Br2, exp: &[u8]) { + let mut cat = Vec::new(); + loop { + let consume = { + let buf1 = br1.fill_buf().unwrap(); + let buf2 = br2.fill_buf().unwrap(); + let minlen = if buf1.len() < buf2.len() { buf1.len() } else { buf2.len() }; + assert_eq!(buf1[..minlen], buf2[..minlen]); + cat.extend_from_slice(&buf1[..minlen]); + minlen + }; + if consume == 0 { + break; + } + br1.consume(consume); + br2.consume(consume); + } + assert_eq!(br1.fill_buf().unwrap().len(), 0); + assert_eq!(br2.fill_buf().unwrap().len(), 0); + assert_eq!(&cat[..], &exp[..]) + } + + #[test] + fn chain_bufread() { + let testdata = b"ABCDEFGHIJKL"; + let chain1 = (&testdata[..3]).chain(&testdata[3..6]).chain(&testdata[6..9]).chain(&testdata[9..]); + let chain2 = (&testdata[..4]).chain(&testdata[4..8]).chain(&testdata[8..]); + cmp_bufread(chain1, chain2, &testdata[..]); + } + #[bench] fn bench_read_to_end(b: &mut test::Bencher) { b.iter(|| {