make clippy happy

KillingSpark · Nov 22, 2024 · 9e665fe · 9e665fe
1 parent b94d208
commit 9e665fe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/src/encoding/bit_writer.rs b/src/encoding/bit_writer.rs
@@ -31,7 +31,7 @@ impl BitWriter<&mut Vec<u8>> {}
 
 impl<V: AsMut<Vec<u8>>> BitWriter<V> {
     /// Initialize a new writer.
-    pub fn from<'a>(mut output: V) -> BitWriter<V> {
+    pub fn from(mut output: V) -> BitWriter<V> {
         BitWriter {
             bit_idx: output.as_mut().len() * 8,
             output,

diff --git a/src/encoding/match_generator.rs b/src/encoding/match_generator.rs
@@ -183,16 +183,11 @@ impl<'data> MatchGenerator<'data> {
 
     fn reserve(&mut self, amount: usize) {
         assert!(self.max_window_size > amount);
-        let mut removed_slices = 0;
         while self.window_size + amount > self.max_window_size {
             let removed = self.window.remove(0);
             self.window_size -= removed.data.len();
             #[cfg(debug_assertions)]
             self.concat_window.drain(0..removed.data.len());
-            removed_slices += 1;
-        }
-        if removed_slices == 0 {
-            return;
         }
     }
 }

diff --git a/src/fse/fse_encoder.rs b/src/fse/fse_encoder.rs
@@ -356,28 +356,28 @@ fn next_position(mut p: usize, table_size: usize) -> usize {
     p
 }
 
-const ML_DIST: &'static [i32] = &[
+const ML_DIST: &[i32] = &[
     1, 4, 3, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
 ];
 
-const LL_DIST: &'static [i32] = &[
+const LL_DIST: &[i32] = &[
     4, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, 1, 1, 1, 1, 1,
     -1, -1, -1, -1,
 ];
 
-const OF_DIST: &'static [i32] = &[
+const OF_DIST: &[i32] = &[
     1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1,
 ];
 
 pub(crate) fn default_ml_table() -> FSETable {
-    build_table_from_probabilities(&ML_DIST, 6)
+    build_table_from_probabilities(ML_DIST, 6)
 }
 
 pub(crate) fn default_ll_table() -> FSETable {
-    build_table_from_probabilities(&LL_DIST, 6)
+    build_table_from_probabilities(LL_DIST, 6)
 }
 
 pub(crate) fn default_of_table() -> FSETable {
-    build_table_from_probabilities(&OF_DIST, 5)
+    build_table_from_probabilities(OF_DIST, 5)
 }
diff --git a/src/huff0/huff0_encoder.rs b/src/huff0/huff0_encoder.rs
@@ -17,7 +17,7 @@ impl<V: AsMut<Vec<u8>>> HuffmanEncoder<'_, V> {
     }
     pub fn encode(&mut self, data: &[u8]) {
         self.write_table();
-        Self::encode_stream(&self.table, &mut self.writer, data);
+        Self::encode_stream(&self.table, self.writer, data);
     }
     pub fn encode4x(&mut self, data: &[u8]) {
         assert!(data.len() >= 4);