fix some clippy warnings

diff --git a/nihav-indeo/src/codecs/ivibr.rs b/nihav-indeo/src/codecs/ivibr.rs
index b3e7aea2e8b6537599bade4d4b98d9f8bde4e5b3..89cd4bf84ba7413567d9c4abd080fdf7e56e2929 100644 (file)
--- a/nihav-indeo/src/codecs/ivibr.rs
+++ b/nihav-indeo/src/codecs/ivibr.rs
@@ -221,7 +221,6 @@ let tile_end = tile_start + len * 8;
             }
         }
         br.align();
-    } else {
     }
 
     Ok(())

diff --git a/nihav-llaudio/src/codecs/apepred.rs b/nihav-llaudio/src/codecs/apepred.rs
index 95b4b8858ccaa956e733bc3934ca990421040457..a3642ed5932c5bf25c269ca2424db420607be3a1 100644 (file)
--- a/nihav-llaudio/src/codecs/apepred.rs
+++ b/nihav-llaudio/src/codecs/apepred.rs
@@ -345,9 +345,8 @@ impl NewFilt {
         };
         obj.version = version;
         let new = version >= 3980;
-        for i in 0..3 {
-            let (ord16, bits) = NEW_FILTER_PARAMS[cidx][i];
-            obj.filters[i] = NFilterContext::new(ord16, bits, new);
+        for (dfilt, &(ord16, bits)) in obj.filters.iter_mut().zip(NEW_FILTER_PARAMS[cidx].iter()) {
+            *dfilt = NFilterContext::new(ord16, bits, new);
         }
         obj
     }

diff --git a/nihav-llaudio/src/codecs/flac.rs b/nihav-llaudio/src/codecs/flac.rs
index 63fa288d92d4bf53f58c77fbefd0db964eae036d..ac6fd5352c0fc93780778b70116e1a88683353e1 100644 (file)
--- a/nihav-llaudio/src/codecs/flac.rs
+++ b/nihav-llaudio/src/codecs/flac.rs
@@ -532,7 +532,7 @@ impl FLACPacketiser {
             };
         let channels = match chan_idx {
                 0..=7 => chan_idx + 1,
-                8 | 9 | 10 => 2,
+                8..=10 => 2,
                 _ => return Err(DecoderError::InvalidData),
             };
 

diff --git a/nihav-llaudio/src/codecs/flacenc.rs b/nihav-llaudio/src/codecs/flacenc.rs
index e1e895804f7432f1cf4570c884ed7380b84af972..43262752df0cb7b7483583b637d4341f22772812 100644 (file)
--- a/nihav-llaudio/src/codecs/flacenc.rs
+++ b/nihav-llaudio/src/codecs/flacenc.rs
@@ -330,7 +330,7 @@ impl FLACEncoder {
                         bw.write_s(el, samp_bits);
                     }
                 },
-                -1 | -2 | -3 | -4 => {
+                -4..=-1 => {
                     let order = -self.order as usize;
 
                     apply_fixed_filter(&mut self.tmp, samp, self.order);

diff --git a/nihav-misc/src/codecs/ultimotion.rs b/nihav-misc/src/codecs/ultimotion.rs
index de24c70d8495431f13f8920d16655c7acdb276a7..ee540147faf1aceff5c40bf75bead1d97a667d28 100644 (file)
--- a/nihav-misc/src/codecs/ultimotion.rs
+++ b/nihav-misc/src/codecs/ultimotion.rs
@@ -56,7 +56,7 @@ impl NADecoder for UltimotionDecoder {
     }
     fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
         let src = pkt.get_buffer();
-        validate!(src.len() > 0 && src[src.len() - 1] == 0x73);
+        validate!(!src.is_empty() && src[src.len() - 1] == 0x73);
         let mut br = MemoryReader::new_read(&src);
 
         let mut buf = if pkt.is_keyframe() {

diff --git a/nihav-ms/src/codecs/msvideo1enc.rs b/nihav-ms/src/codecs/msvideo1enc.rs
index 91911dfe22535fbaad7753f2293dd1c1c4f0a26e..3188e15bed2733ea6c267feb96129b304270e104 100644 (file)
--- a/nihav-ms/src/codecs/msvideo1enc.rs
+++ b/nihav-ms/src/codecs/msvideo1enc.rs
@@ -304,7 +304,6 @@ impl BlockState {
             for &pix in buf.iter() {
                 if pix == self.clr2[0] {
                     self.clr2_flags |= mask;
-                } else {
                 }
                 mask <<= 1;
             }

diff --git a/nihav-qt/src/codecs/qdm2qmf.rs b/nihav-qt/src/codecs/qdm2qmf.rs
index c1f461af7379dffbadcfb5ba30cbba0dadb29f35..910ac385ce2c597548b407ebc71ab82e0bd70a35 100644 (file)
--- a/nihav-qt/src/codecs/qdm2qmf.rs
+++ b/nihav-qt/src/codecs/qdm2qmf.rs
@@ -559,8 +559,7 @@ unimplemented!();
             if c > 3 {
                 if self.is_intra {
                     for ch in 0..self.channels {
-                        for band in 0..MAX_BANDS {
-                            let sb = QUANT_WEIGHT[self.cm_selector][band];
+                        for (band, &sb) in QUANT_WEIGHT[self.cm_selector].iter().enumerate().take(MAX_BANDS) {
                             self.quant_weight[ch][band] = [sb; 64];
                         }
                     }

diff --git a/nihav-vivo/src/codecs/g723_1.rs b/nihav-vivo/src/codecs/g723_1.rs
index a27ed63200566521eb13daddde73dca48396615e..c4077b31a89a4c590ff471f2c063a95623095784 100644 (file)
--- a/nihav-vivo/src/codecs/g723_1.rs
+++ b/nihav-vivo/src/codecs/g723_1.rs
@@ -544,8 +544,8 @@ impl G7231Decoder {
             let t = self.cng_rnd.next_range(1 << 13);
             off[i]     = t & 1;
             off[i + 1] = ((t >> 1) & 1) + SUBFRAME_LEN;
-            for j in 0..11 {
-                signs[i/2][j] = ((((t >> (j + 2)) & 1) * 2 - 1) << 14) as i32;
+            for (j, sign) in signs[i / 2].iter_mut().enumerate() {
+                *sign = ((((t >> (j + 2)) & 1) * 2 - 1) << 14) as i32;
             }
         }