cleanup: replace try! with ?

src/decoder.rs

@@ -62,7 +62,7 @@ impl<R: io::Read> BomPeeker<R> {
         }
         self.bom = Some(Bom { bytes: [0; 3], len: 0 });
         let mut buf = [0u8; 3];
-        let bom_len = try!(read_full(&mut self.rdr, &mut buf));
+        let bom_len = read_full(&mut self.rdr, &mut buf)?;
         self.bom = Some(Bom { bytes: buf, len: bom_len });
         Ok(self.bom.unwrap())
     }
@@ -71,7 +71,7 @@ impl<R: io::Read> BomPeeker<R> {
 impl<R: io::Read> io::Read for BomPeeker<R> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         if self.nread < 3 {
-            let bom = try!(self.peek_bom());
+            let bom = self.peek_bom()?;
             let bom = bom.as_slice();
             if self.nread < bom.len() {
                 let rest = &bom[self.nread..];
@@ -81,7 +81,7 @@ impl<R: io::Read> io::Read for BomPeeker<R> {
                 return Ok(len);
             }
         }
-        let nread = try!(self.rdr.read(buf));
+        let nread = self.rdr.read(buf)?;
         self.nread += nread;
         Ok(nread)
     }
@@ -196,7 +196,7 @@ impl<R: io::Read, B: AsMut<[u8]>> DecodeReader<R, B> {
         }
         self.pos = 0;
         self.buflen +=
-            try!(self.rdr.read(&mut self.buf.as_mut()[self.buflen..]));
+            self.rdr.read(&mut self.buf.as_mut()[self.buflen..])?;
         Ok(())
     }
 
@@ -219,7 +219,7 @@ impl<R: io::Read, B: AsMut<[u8]>> DecodeReader<R, B> {
             return Ok(0);
         }
         if self.pos >= self.buflen {
-            try!(self.fill());
+            self.fill()?;
         }
         let mut nwrite = 0;
         loop {
@@ -235,7 +235,7 @@ impl<R: io::Read, B: AsMut<[u8]>> DecodeReader<R, B> {
             }
             // Otherwise, we know that our internal buffer has insufficient
             // data to transcode at least one char, so we attempt to refill it.
-            try!(self.fill());
+            self.fill()?;
             // Quit on EOF.
             if self.buflen == 0 {
                 self.pos = 0;
@@ -251,7 +251,7 @@ impl<R: io::Read, B: AsMut<[u8]>> DecodeReader<R, B> {
 
     #[inline(never)] // impacts perf...
     fn detect(&mut self) -> io::Result<()> {
-        let bom = try!(self.rdr.peek_bom());
+        let bom = self.rdr.peek_bom()?;
         self.decoder = bom.decoder();
         Ok(())
     }
@@ -261,7 +261,7 @@ impl<R: io::Read, B: AsMut<[u8]>> io::Read for DecodeReader<R, B> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         if self.first {
             self.first = false;
-            try!(self.detect());
+            self.detect()?;
         }
         if self.decoder.is_none() {
             return self.rdr.read(buf);