From: Kostya Shishkov <kostya.shishkov@gmail.com>
Date: Wed, 1 Apr 2026 20:01:37 +0000 (+0200)
Subject: fix some clippy warnings
X-Git-Url: https://git.nihav.org/?a=commitdiff_plain;h=3affaaeca5d31bb11dbcebf3657be570858b6ff8;p=nihav.git

fix some clippy warnings
---

diff --git a/nihav-indeo/src/codecs/ivibr.rs b/nihav-indeo/src/codecs/ivibr.rs
index b3e7aea..89cd4bf 100644
--- 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 95b4b88..a3642ed 100644
--- 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 63fa288..ac6fd53 100644
--- 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 e1e8958..4326275 100644
--- 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 de24c70..ee54014 100644
--- 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 91911df..3188e15 100644
--- 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 c1f461a..910ac38 100644
--- 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 a27ed63..c4077b3 100644
--- 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;
             }
         }