aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2020-10-07 16:13:03 +0200
committerKostya Shishkov <kostya.shishkov@gmail.com>2020-10-07 16:13:03 +0200
commit016340a0e75cf93fa138a9b37fb5260d04eb3ee0 (patch)
treee0db30252c9a87950bf8707242debb39dd92c257
parent95221ccc81e3bdad749a7aa49b48499c73fc699a (diff)
downloadnihav-016340a0e75cf93fa138a9b37fb5260d04eb3ee0.tar.gz
eliminate some cargo-clippy warnings
-rw-r--r--nihav-game/src/codecs/mod.rs2
-rw-r--r--nihav-game/src/codecs/vx.rs4
-rw-r--r--nihav-game/src/demuxers/vx.rs1
3 files changed, 4 insertions, 3 deletions
diff --git a/nihav-game/src/codecs/mod.rs b/nihav-game/src/codecs/mod.rs
index 4952b13..d54abb6 100644
--- a/nihav-game/src/codecs/mod.rs
+++ b/nihav-game/src/codecs/mod.rs
@@ -19,6 +19,8 @@ pub mod midivid3;
#[cfg(feature="decoder_vmd")]
pub mod vmd;
#[cfg(feature="decoder_vx")]
+#[allow(clippy::erasing_op)]
+#[allow(clippy::identity_op)]
pub mod vx;
const GAME_CODECS: &[DecoderInfo] = &[
diff --git a/nihav-game/src/codecs/vx.rs b/nihav-game/src/codecs/vx.rs
index 977e4e1..185c9f4 100644
--- a/nihav-game/src/codecs/vx.rs
+++ b/nihav-game/src/codecs/vx.rs
@@ -1119,8 +1119,7 @@ impl AudioState {
}
fn apply_lpc(dst: &mut [i32], src: &[i32], hist: &mut [i32], filt: &[i32; 8]) {
- let mut hidx = 0;
- for (out, src) in dst.iter_mut().zip(src.iter()) {
+ for (hidx, (out, src)) in dst.iter_mut().zip(src.iter()).enumerate() {
let mut sum = *src << 14;
for i in 0..8 {
sum += hist[(hidx + i) & 7] * filt[i];
@@ -1128,7 +1127,6 @@ fn apply_lpc(dst: &mut [i32], src: &[i32], hist: &mut [i32], filt: &[i32; 8]) {
let samp = sum >> 14;
*out = samp;
hist[hidx & 7] = samp;
- hidx += 1;
}
}
diff --git a/nihav-game/src/demuxers/vx.rs b/nihav-game/src/demuxers/vx.rs
index 5d2786d..245ca49 100644
--- a/nihav-game/src/demuxers/vx.rs
+++ b/nihav-game/src/demuxers/vx.rs
@@ -19,6 +19,7 @@ struct VXDemuxer<'a> {
impl<'a> DemuxCore<'a> for VXDemuxer<'a> {
#[allow(unused_variables)]
+ #[allow(clippy::cast_lossless)]
fn open(&mut self, strmgr: &mut StreamManager, _seek_index: &mut SeekIndex) -> DemuxerResult<()> {
let src = &mut self.src;