Extract part of insert

Author: Markus Westerlind

src/raw/mod.rs

@@ -847,11 +847,10 @@ impl<T, A: Allocator + Clone> RawTable<T, A> {
                 index = self.table.find_insert_slot(hash);
             }
 
+            self.table.record_item_insert_at(index, old_ctrl, hash);
+
             let bucket = self.bucket(index);
-            self.table.growth_left -= special_is_empty(old_ctrl) as usize;
-            self.table.set_ctrl_h2(index, hash);
             bucket.write(value);
-            self.table.items += 1;
             bucket
         }
     }
@@ -866,16 +865,14 @@ impl<T, A: Allocator + Clone> RawTable<T, A> {
     #[cfg_attr(feature = "inline-more", inline)]
     pub fn try_insert_no_grow(&mut self, hash: u64, value: T) -> Result<Bucket<T>, T> {
         unsafe {
-            let index = self.find_insert_slot(hash);
-            let old_ctrl = *self.ctrl(index);
-            if unlikely(self.growth_left == 0 && special_is_empty(old_ctrl)) {
+            let index = self.table.find_insert_slot(hash);
+            let old_ctrl = *self.table.ctrl(index);
+            if unlikely(self.table.growth_left == 0 && special_is_empty(old_ctrl)) {
                 Err(value)
             } else {
+                self.table.record_item_insert_at(index, old_ctrl, hash);
                 let bucket = self.bucket(index);
-                self.growth_left -= special_is_empty(old_ctrl) as usize;
-                self.set_ctrl(index, h2(hash));
                 bucket.write(value);
-                self.items += 1;
                 Ok(bucket)
             }
         }
@@ -1269,6 +1266,13 @@ impl<A: Allocator + Clone> RawTableInner<A> {
         }
     }
 
+    #[inline]
+    unsafe fn record_item_insert_at(&mut self, index: usize, old_ctrl: u8, hash: u64) {
+        self.growth_left -= special_is_empty(old_ctrl) as usize;
+        self.set_ctrl_h2(index, hash);
+        self.items += 1;
+    }
+
     /// Sets a control byte to the hash, and possibly also the replicated control byte at
     /// the end of the array.
     #[inline]