From 82694c6dc98d487c68bc90f684425d5ddc511e47 Mon Sep 17 00:00:00 2001 From: Moritz Borcherding Date: Fri, 18 Oct 2024 17:58:06 +0200 Subject: [PATCH] make clippy happy --- src/encoding/blocks/compressed.rs | 9 ++++----- src/fse/fse_encoder.rs | 6 +----- src/huff0/huff0_encoder.rs | 5 ++--- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/encoding/blocks/compressed.rs b/src/encoding/blocks/compressed.rs index 60b1443..fb28fac 100644 --- a/src/encoding/blocks/compressed.rs +++ b/src/encoding/blocks/compressed.rs @@ -35,12 +35,11 @@ fn compress_literals(literals: &[u8], writer: &mut BitWriter) { _ => unimplemented!("too many literals"), }; - let encoded; - if size_format == 0 { - encoded = encoder.encode(literals); + let encoded = if size_format == 0 { + encoder.encode(literals) } else { - encoded = encoder.encode4x(literals); - } + encoder.encode4x(literals) + }; writer.write_bits(size_format, 2); writer.write_bits(literals.len() as u32, size_bits); diff --git a/src/fse/fse_encoder.rs b/src/fse/fse_encoder.rs index 60eaf9c..e879bae 100644 --- a/src/fse/fse_encoder.rs +++ b/src/fse/fse_encoder.rs @@ -250,11 +250,7 @@ fn build_table_from_counts(counts: &[usize], max_log: u8, avoid_0_numbit: bool) // find first occurence of the second_max to avoid lifting the last zero let second_max = *probs.iter_mut().filter(|x| **x != max).max().unwrap(); - let second_max = probs - .iter_mut() - .filter(|x| **x == second_max) - .next() - .unwrap(); + let second_max = probs.iter_mut().find(|x| **x == second_max).unwrap(); *second_max += redistribute; assert!(*second_max <= max); } diff --git a/src/huff0/huff0_encoder.rs b/src/huff0/huff0_encoder.rs index f1e95aa..131118c 100644 --- a/src/huff0/huff0_encoder.rs +++ b/src/huff0/huff0_encoder.rs @@ -101,9 +101,8 @@ impl HuffmanEncoder { if weights.len() > 16 { // TODO share output vec between encoders // TODO assert that no 0 num_bit states are generated here - let mut encoder = - FSEEncoder::new(fse_encoder::build_table_from_data(&weights, 6, true)); - let encoded = encoder.encode_interleaved(&weights); + let mut encoder = FSEEncoder::new(fse_encoder::build_table_from_data(weights, 6, true)); + let encoded = encoder.encode_interleaved(weights); assert!(encoded.len() < 128); self.writer.write_bits(encoded.len() as u8, 8); self.writer.append_bytes(&encoded);