Merge #33

33: More bug fixes r=Amanieu a=Amanieu



Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>

Author: bors[bot]

src/raw/generic.rs

@@ -122,7 +122,7 @@ impl Group {
     /// - `FULL => DELETED`
     #[inline]
     pub fn convert_special_to_empty_and_full_to_deleted(&self) -> Group {
-        let special = self.0 & repeat(0x80);
-        Group(special + (!special >> 7))
+        let full = !self.0 & repeat(0x80);
+        Group(!full + (full >> 7))
     }
 }

src/raw/mod.rs

@@ -554,8 +554,9 @@ impl<T> RawTable<T> {
                     // size. If both the new and old position fall within the
                     // same unaligned group, then there is no benefit in moving
                     // it and we can just continue to the next item.
-                    let probe_index = |pos| {
-                        ((pos - guard.probe_seq(hash).offset) & guard.bucket_mask) / Group::WIDTH
+                    let probe_index = |pos: usize| {
+                        (pos.wrapping_sub(guard.probe_seq(hash).offset) & guard.bucket_mask)
+                            / Group::WIDTH
                     };
                     if likely(probe_index(i) == probe_index(new_i)) {
                         guard.set_ctrl(i, h2(hash));