Make State::ins_h u32

Author: brianpane

zlib-rs/src/deflate.rs

@@ -1351,7 +1351,7 @@ pub(crate) struct State<'a> {
     pub(crate) head: WeakArrayMut<'a, u16, HASH_SIZE>,
 
     ///  hash index of string to be inserted
-    pub(crate) ins_h: usize,
+    pub(crate) ins_h: u32,
 
     crc_fold: crate::crc32::Crc32Fold,
     gzhead: Option<&'a mut gz_header>,
@@ -1802,7 +1802,7 @@ pub(crate) fn fill_window(stream: &mut DeflateStream) {
             if state.max_chain_length > 1024 {
                 let v0 = state.window.filled()[string] as u32;
                 let v1 = state.window.filled()[string + 1] as u32;
-                state.ins_h = state.update_hash(v0, v1) as usize;
+                state.ins_h = state.update_hash(v0, v1);
             } else if string >= 1 {
                 state.quick_insert_string(string + 2 - STD_MIN_MATCH);
             }

zlib-rs/src/deflate/hash_calc.rs

@@ -91,10 +91,10 @@ impl RollHashCalc {
     pub fn quick_insert_string(state: &mut State, string: usize) -> u16 {
         let val = state.window.filled()[string + Self::HASH_CALC_OFFSET] as u32;
 
-        state.ins_h = Self::hash_calc(state.ins_h as u32, val) as usize;
-        state.ins_h &= Self::HASH_CALC_MASK as usize;
+        state.ins_h = Self::hash_calc(state.ins_h, val);
+        state.ins_h &= Self::HASH_CALC_MASK;
 
-        let hm = state.ins_h;
+        let hm = state.ins_h as usize;
 
         let head = state.head.as_slice()[hm];
         if head != string as u16 {
@@ -111,9 +111,9 @@ impl RollHashCalc {
         for (i, val) in slice.iter().copied().enumerate() {
             let idx = string as u16 + i as u16;
 
-            state.ins_h = Self::hash_calc(state.ins_h as u32, val as u32) as usize;
-            state.ins_h &= Self::HASH_CALC_MASK as usize;
-            let hm = state.ins_h;
+            state.ins_h = Self::hash_calc(state.ins_h, val as u32);
+            state.ins_h &= Self::HASH_CALC_MASK;
+            let hm = state.ins_h as usize;
 
             let head = state.head.as_slice()[hm];
             if head != idx {