replace try! with ?

src/gz/bufread.rs

@@ -17,7 +17,8 @@ fn copy(into: &mut [u8], from: &[u8], pos: &mut usize) -> usize {
     *pos += min;
     return min;
 }
-pub fn corrupt() -> io::Error {
+
+pub(crate) fn corrupt() -> io::Error {
     io::Error::new(
         io::ErrorKind::InvalidInput,
         "corrupt gzip stream does not have a matching checksum",
@@ -34,7 +35,7 @@ fn read_le_u16<R: Read>(r: &mut R) -> io::Result<u16> {
     Ok((b[0] as u16) | ((b[1] as u16) << 8))
 }
 
-pub fn read_gz_header<R: Read>(r: &mut R) -> io::Result<GzHeader> {
+pub(crate) fn read_gz_header<R: Read>(r: &mut R) -> io::Result<GzHeader> {
     let mut crc_reader = CrcReader::new(r);
     let mut header = [0; 10];
     crc_reader.read_exact(&mut header)?;

src/gz/write.rs

@@ -273,7 +273,7 @@ impl<W: Write> GzDecoder<W> {
     /// This function will perform I/O to finish the stream, returning any
     /// errors which happen.
     pub fn try_finish(&mut self) -> io::Result<()> {
-        try!(self.finish_and_check_crc());
+        self.finish_and_check_crc()?;
         Ok(())
     }
 
@@ -293,12 +293,12 @@ impl<W: Write> GzDecoder<W> {
     /// This function will perform I/O to complete this stream, and any I/O
     /// errors which occur will be returned from this function.
     pub fn finish(mut self) -> io::Result<W> {
-        try!(self.finish_and_check_crc());
+        self.finish_and_check_crc()?;
         Ok(self.inner.take_inner().into_inner())
     }
 
     fn finish_and_check_crc(&mut self) -> io::Result<()> {
-        try!(self.inner.finish());
+        self.inner.finish()?;
 
         if self.crc_bytes.len() != 8 {
             return Err(corrupt());
@@ -322,7 +322,7 @@ impl<W: Write> GzDecoder<W> {
     }
 
     fn write_buf(&mut self, buf: &[u8]) -> io::Result<usize> {
-        let (n, status) = try!(self.inner.write_with_status(buf));
+        let (n, status) = self.inner.write_with_status(buf)?;
 
         if status == Status::StreamEnd {
             if n < buf.len() && self.crc_bytes.len() < 8 {
@@ -403,7 +403,7 @@ impl<W: Write> Write for GzDecoder<W> {
                 Ok(header) => {
                     self.header = Some(header);
                     self.header_buf.truncate(0);
-                    let n = try!(self.write_buf(&buf[pos..]));
+                    let n = self.write_buf(&buf[pos..])?;
                     Ok(n + pos)
                 }
             }