Skip to content

Commit

Permalink
Pacify Rust 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
kali authored and ruuda committed Sep 10, 2018
1 parent e03672f commit 8832fc4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ impl<'r, R: 'r + io::Read> Drop for EmbeddedReader<'r, R> {

impl<'r, R: io::Read> io::Read for EmbeddedReader<'r, R> {
fn read(&mut self, buffer: &mut[u8]) -> io::Result<usize> {
let max = buffer.len().min(self.remaining as usize);
let max = cmp::min(buffer.len(), self.remaining as usize);
let read = try!(self.reader.read(&mut buffer[0..max]));
self.remaining -= read as i64;
Ok(read)
Expand Down Expand Up @@ -700,7 +700,7 @@ impl<R: io::Read> io::Read for ChunksReader<R> {
if data.remaining <= 0 {
return Ok(0)
}
let max = buffer.len().min(data.remaining as usize);
let max = cmp::min(buffer.len(), data.remaining as usize);
let read = try!(self.reader.read(&mut buffer[0..max]));
self.data_state.as_mut().unwrap().remaining -= read as i64;
Ok(read)
Expand Down

0 comments on commit 8832fc4

Please sign in to comment.