fix clippy warnings

[nihav.git] / nihav-commonfmt / src / codecs / jpeg.rs

diff --git a/nihav-commonfmt/src/codecs/jpeg.rs b/nihav-commonfmt/src/codecs/jpeg.rs
index f9689a04a96492dc78b716e962bbdaaa2677be6e..08f30a784be3d2a7460c5c42903b250ce46f6a27 100644 (file)
--- a/nihav-commonfmt/src/codecs/jpeg.rs
+++ b/nihav-commonfmt/src/codecs/jpeg.rs
@@ -443,7 +443,7 @@ fn build_default_cb(dc: bool, idx: usize) -> DecoderResult<Codebook<u8>> {
     if dc {
         generate_cb(&DC_LENS[idx], &DC_SYMS)
     } else {
-        generate_cb(&AC_LENS[idx], &AC_SYMS[idx])
+        generate_cb(&AC_LENS[idx], AC_SYMS[idx])
     }
 }
 
@@ -637,9 +637,7 @@ impl NADecoder for JPEGDecoder {
                                 std::mem::swap(&mut self.buf, &mut data);
                                 let ret = self.decode_scan(&data, buf, &ci[..ns], ss, se);
                                 std::mem::swap(&mut self.buf, &mut data);
-                                if let Err(err) = ret {
-                                    return Err(err);
-                                }
+                                ret?;
                             } else { unreachable!(); }
                         },
                         JPEGType::Progressive => {