Added Tombstones

.gitignore

@@ -0,0 +1,13 @@
+# Compiled files
+*.o
+*.so
+*.rlib
+*.dll
+
+# Executables
+*.exe
+
+# Generated by Cargo
+/target/
+Cargo.lock
+

Cargo.toml

@@ -10,8 +10,6 @@ description = "A hash table with consistent order and fast iteration."
 [lib]
 bench = false
 
-[dependencies]
-
 [dev-dependencies]
 itertools = "0.5.1"
 rand = "0.3"

benches/bench.rs

@@ -610,3 +610,36 @@ fn retain_many_ordermap_100_000(b: &mut Bencher) {
         map
     });
 }
+
+#[bench]
+fn remove_index_tombstones_many_ordermap_100_000(b: &mut Bencher) {
+    let mut map = OMAP_100K.clone();
+    map.retain(|k, _| *k % 7 == 0);
+
+    b.iter(|| {
+        let mut map = map.clone();
+        map.remove_index_tombstones()
+    });
+}
+
+#[bench]
+fn remove_index_tombstones_half_ordermap_100_000(b: &mut Bencher) {
+    let mut map = OMAP_100K.clone();
+    map.retain(|k, _| *k % 2 == 0);
+
+    b.iter(|| {
+        let mut map = map.clone();
+        map.remove_index_tombstones()
+    });
+}
+
+#[bench]
+fn remove_index_tombstones_some_ordermap_100_000(b: &mut Bencher) {
+    let mut map = OMAP_100K.clone();
+    map.retain(|k, _| *k % 100 == 0);
+
+    b.iter(|| {
+        let mut map = map.clone();
+        map.remove_index_tombstones()
+    });
+}

src/util.rs

@@ -1,16 +1,8 @@
 
 use std::iter::Enumerate;
-use std::mem::size_of;
 
-pub fn second<A, B>(t: (A, B)) -> B { t.1 }
 pub fn enumerate<I>(iterable: I) -> Enumerate<I::IntoIter>
     where I: IntoIterator
 {
     iterable.into_iter().enumerate()
 }
-
-/// return the number of steps from a to b
-pub fn ptrdistance<T>(a: *const T, b: *const T) -> usize {
-    debug_assert!(a as usize <= b as usize);
-    (b as usize - a as usize) / size_of::<T>()
-}

tests/quick.rs

@@ -123,8 +123,8 @@ impl<K, V> Arbitrary for Op<K, V>
 }
 
 fn do_ops<K, V>(ops: &[Op<K, V>], a: &mut OrderMap<K, V>, b: &mut HashMap<K, V>)
-    where K: Hash + Eq + Clone,
-          V: Clone,
+    where K: Hash + Eq + Clone + Debug,
+          V: Clone + Debug,
 {
     for op in ops {
         match *op {
@@ -151,7 +151,7 @@ fn do_ops<K, V>(ops: &[Op<K, V>], a: &mut OrderMap<K, V>, b: &mut HashMap<K, V>)
                 }
             }
         }
-        //println!("{:?}", a);
+        assert_eq!(a.len(), b.len(), "last operation was {:?}", op);
     }
 }
 
@@ -200,7 +200,6 @@ quickcheck! {
             assert!(map.contains_key(key));
         }
         true
-
     }
 
     // Check that retain visits each key exactly once