Use self with BackwardMatchMut fn

Move two `init` functions into BackwardMatchMut, moving one of them from another file.
dropbox · Apr 6, 2024 · 0d633b5 · 0d633b5
1 parent 1d8017d
commit 0d633b5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 32 deletions.
diff --git a/src/enc/backward_references/hash_to_binary_tree.rs b/src/enc/backward_references/hash_to_binary_tree.rs
@@ -376,12 +376,16 @@ impl<'a> BackwardMatchMut<'a> {
     pub fn set_length_and_code(&mut self, data: u32) {
         *self.0 = u64::from((*self.0) as u32) | (u64::from(data) << 32);
     }
-}
-
-#[inline(always)]
-pub fn InitBackwardMatch(xself: &mut BackwardMatchMut, dist: usize, len: usize) {
-    xself.set_distance(dist as u32);
-    xself.set_length_and_code((len << 5) as u32);
+    #[inline(always)]
+    pub fn init(&mut self, dist: usize, len: usize) {
+        self.set_distance(dist as u32);
+        self.set_length_and_code((len << 5) as u32);
+    }
+    #[inline(always)]
+    pub(crate) fn init_dictionary(&mut self, dist: usize, len: usize, len_code: usize) {
+        self.set_distance(dist as u32);
+        self.set_length_and_code((len << 5 | if len == len_code { 0 } else { len_code }) as u32);
+    }
 }
 
 macro_rules! LeftChildIndexH10 {
@@ -472,11 +476,7 @@ where
                 ));
                 if matches_offset != matches.len() && (len > *best_len) {
                     *best_len = len;
-                    InitBackwardMatch(
-                        &mut BackwardMatchMut(&mut matches[matches_offset]),
-                        backward,
-                        len,
-                    );
+                    BackwardMatchMut(&mut matches[matches_offset]).init(backward, len);
                     matches_offset += 1;
                 }
                 if len >= max_comp_len {

diff --git a/src/enc/backward_references/hq.rs b/src/enc/backward_references/hq.rs
@@ -1,7 +1,7 @@
 #![allow(dead_code, unused_imports)]
 use super::hash_to_binary_tree::{
-    kInfinity, Allocable, BackwardMatch, BackwardMatchMut, H10Params, InitBackwardMatch,
-    StoreAndFindMatchesH10, Union1, ZopfliNode, H10,
+    kInfinity, Allocable, BackwardMatch, BackwardMatchMut, H10Params, StoreAndFindMatchesH10,
+    Union1, ZopfliNode, H10,
 };
 use super::{
     kDistanceCacheIndex, kDistanceCacheOffset, kHashMul32, kHashMul64, kHashMul64Long,
@@ -283,18 +283,6 @@ fn HashBytesH10(data: &[u8]) -> u32 {
     h >> (32i32 - 17i32)
 }
 
-#[inline(always)]
-fn InitDictionaryBackwardMatch(
-    xself: &mut BackwardMatchMut,
-    dist: usize,
-    len: usize,
-    len_code: usize,
-) {
-    xself.set_distance(dist as u32);
-    (*xself)
-        .set_length_and_code((len << 5 | if len == len_code { 0usize } else { len_code }) as u32);
-}
-
 pub fn StitchToPreviousBlockH10<
     AllocU32: Allocator<u32>,
     Buckets: Allocable<u32, AllocU32> + SliceWrapperMut<u32> + SliceWrapper<u32>,
@@ -397,11 +385,7 @@ where
                     );
                     if len > best_len {
                         best_len = len;
-                        InitBackwardMatch(
-                            &mut BackwardMatchMut(&mut matches[matches_offset]),
-                            backward,
-                            len,
-                        );
+                        BackwardMatchMut(&mut matches[matches_offset]).init(backward, len);
                         matches_offset += 1;
                     }
                 }
@@ -454,8 +438,7 @@ where
                             .wrapping_add((dict_id >> 5) as usize)
                             .wrapping_add(1);
                         if distance <= params.dist.max_distance {
-                            InitDictionaryBackwardMatch(
-                                &mut BackwardMatchMut(&mut matches[matches_offset]),
+                            BackwardMatchMut(&mut matches[matches_offset]).init_dictionary(
                                 distance,
                                 l,
                                 (dict_id & 31u32) as usize,