minor improvements

Author: nicolaskagami

src/bitmap.rs

@@ -34,6 +34,14 @@ where
         }
     }
 
+    /// Returns the index of the entry attributed to the given leaf id using leafvec optimization.
+    /// Will be the same as `bitmap_index` when the id is not set.
+    /// Apparently it's slightly slower than `bitmap_index`.
+    #[inline(always)] // Particularly effective to inline
+    pub(crate) fn leafvec_index(&self, id: T) -> u32 {
+        (self.bits << (63u8 - id.into())).count_ones() - 1
+    }
+
     /// Returns true if the bitmap contains the given ID.
     #[inline(always)]
     pub(crate) fn contains(&self, id: T) -> bool {
@@ -53,15 +61,6 @@ where
     }
 }
 
-impl Bitmap<StrideId> {
-    /// Returns the index of leaf attributed to the given `LeafId` using leafvec optimization
-    // Actually slower than `bitmap_index`
-    #[inline(always)] // Particularly effective to inline
-    pub(crate) fn leafvec_index(&self, id: StrideId) -> u32 {
-        (self.bits << (63u8 - id.0)).count_ones() - 1
-    }
-}
-
 /// A unique identifier for a prefix in the poptrie.
 ///
 /// The ID is a mapping of the last segment of the prefix, i.e. the last "stride", including the valid length.

src/lib.rs

@@ -57,6 +57,7 @@ const STRIDE: u8 = 6;
 /// assert_eq!(trie.lookup(u32::from_be_bytes([10, 1, 2, 3])), Some(&"10.0.0.0/8"));
 /// assert_eq!(trie.lookup(u32::from_be_bytes([8, 8, 8, 8])), None);
 /// ```
+#[derive(Debug, Clone)]
 pub struct Poptrie<K, V>
 where
     K: Key,

tests/api.rs

@@ -309,13 +309,13 @@ fn insert_order_does_not_affect_lpm() {
     reverse.insert(0b000001_000001_000000_000000_000000_00u32, 12, 12);
     reverse.insert(0b000001_000000_000000_000000_000000_00u32, 6, 6);
 
-    let probes = [
+    let lookups = [
         0b000001_000001_000001_111111_000000_00u32,
         0b000001_000001_000010_000000_000000_00u32,
         0b000001_000010_000000_000000_000000_00u32,
         0b000010_000000_000000_000000_000000_00u32,
     ];
-    for addr in probes {
+    for addr in lookups {
         assert_eq!(forward.lookup(addr), reverse.lookup(addr),);
     }
 }