feat: add slices to keys implementations

Cargo.toml

@@ -15,7 +15,7 @@ categories = ["data-structures", "text-processing"]
 
 [dependencies]
 nibble_vec = "0.1"
-endian-type = "0.1.2"
+endian-type = "0.2.0"
 serde = { version = "1.0", optional = true }
 
 [dev-dependencies]

src/iter.rs

@@ -25,7 +25,7 @@ impl<'a, K, V> Iter<'a, K, V> {
     // TODO: make this private somehow (and same for the other iterators).
     pub fn new(root: &'a TrieNode<K, V>) -> Iter<'a, K, V> {
         Iter {
-            root: root,
+            root,
             root_visited: false,
             stack: vec![],
         }
@@ -105,7 +105,7 @@ impl<'a, K, V> Iterator for Children<'a, K, V> {
     fn next(&mut self) -> Option<SubTrie<'a, K, V>> {
         self.inner.next().map(|node| SubTrie {
             prefix: self.prefix.clone().join(&node.key),
-            node: node,
+            node,
         })
     }
 }

src/keys.rs

@@ -131,18 +131,14 @@ impl<'a, T: ?Sized + TrieKey> TrieKey for &'a mut T {
 impl TrieKey for i8 {
     #[inline]
     fn encode_bytes(&self) -> Vec<u8> {
-        let mut v: Vec<u8> = Vec::with_capacity(1);
-        v.push(*self as u8);
-        v
+        vec![*self as u8]
     }
 }
 
 impl TrieKey for u8 {
     #[inline]
     fn encode_bytes(&self) -> Vec<u8> {
-        let mut v: Vec<u8> = Vec::with_capacity(1);
-        v.push(*self);
-        v
+        vec![*self]
     }
 }
 
@@ -168,7 +164,7 @@ where
     T: Eq + Copy,
 {
     fn encode_bytes(&self) -> Vec<u8> {
-        self.as_bytes().encode_bytes()
+        self.as_byte_slice().encode_bytes()
     }
 }
 
@@ -177,7 +173,7 @@ where
     T: Eq + Copy,
 {
     fn encode_bytes(&self) -> Vec<u8> {
-        self.as_bytes().to_vec()
+        self.as_byte_slice().to_vec()
     }
 }
 
@@ -194,7 +190,7 @@ macro_rules! int_keys {
     };
 }
 
-int_keys!(u16, u32, u64, i16, i32, i64, usize, isize);
+int_keys!(u16, u32, u64, u128, i16, i32, i64, i128, usize, isize);
 
 macro_rules! vec_int_keys {
   ( $( $t:ty ),* ) => {
@@ -212,7 +208,25 @@ macro_rules! vec_int_keys {
    };
 }
 
-vec_int_keys!(u16, u32, u64, i16, i32, i64, usize, isize);
+vec_int_keys!(u16, u32, u64, u128, i16, i32, i64, i128, usize, isize);
+
+macro_rules! slice_int_keys {
+  ( $( $t:ty ),* ) => {
+      $(
+      impl TrieKey for [$t] {
+        fn encode_bytes(&self) -> Vec<u8> {
+            let mut v = Vec::<u8>::with_capacity(self.len() * std::mem::size_of::<$t>());
+            for u in self {
+                v.extend_from_slice(&u.to_be_bytes());
+            }
+            v
+        }
+      }
+      )*
+   };
+}
+
+slice_int_keys!(u16, u32, u64, u128, i16, i32, i64, i128, usize, isize);
 
 #[cfg(test)]
 mod test {

src/traversal.rs

@@ -94,7 +94,7 @@ fn iterative_insert<K, V>(trie: &mut TrieNode<K, V>, key: K, value: V, mut nv: N
 where
     K: TrieKey,
 {
-    if nv.len() == 0 {
+    if nv.is_empty() {
         return trie.replace_value(key, value);
     }
 
@@ -155,7 +155,7 @@ where
 {
     let nv = key.encode();
 
-    if nv.len() == 0 {
+    if nv.is_empty() {
         return trie.take_value(key);
     }
 
@@ -273,7 +273,7 @@ fn get_ancestor<'a, K, V>(
 where
     K: TrieKey,
 {
-    if nv.len() == 0 {
+    if nv.is_empty() {
         return trie.as_value_node().map(|node| (node, 0));
     }
 
@@ -313,7 +313,7 @@ fn get_raw_ancestor<'a, K, V>(trie: &'a TrieNode<K, V>, nv: &Nibblet) -> (&'a Tr
 where
     K: TrieKey,
 {
-    if nv.len() == 0 {
+    if nv.is_empty() {
         return (trie, 0);
     }
 
@@ -357,7 +357,7 @@ fn get_raw_descendant<'a, K, V>(
     trie: &'a TrieNode<K, V>,
     nv: &Nibblet,
 ) -> Option<DescendantResult<'a, K, V>> {
-    if nv.len() == 0 {
+    if nv.is_empty() {
         return Some(NoModification(trie));
     }
 

src/trie_node.rs

@@ -48,10 +48,7 @@ where
     pub fn with_key_value(key_fragments: Nibblet, key: K, value: V) -> TrieNode<K, V> {
         TrieNode {
             key: key_fragments,
-            key_value: Some(Box::new(KeyValue {
-                key: key,
-                value: value,
-            })),
+            key_value: Some(Box::new(KeyValue { key, value })),
             children: Default::default(),
             child_count: 0,
         }
@@ -216,18 +213,15 @@ where
         // Insert the collected items below what is now an empty prefix node.
         let bucket = key.get(0) as usize;
         self.children[bucket] = Some(Box::new(TrieNode {
-            key: key,
+            key,
             key_value,
             children,
             child_count,
         }));
     }
     #[inline]
     pub fn as_subtrie(&self, prefix: Nibblet) -> SubTrie<K, V> {
-        SubTrie {
-            prefix: prefix,
-            node: self,
-        }
+        SubTrie { prefix, node: self }
     }
     #[inline]
     pub fn as_subtrie_mut<'a>(
@@ -236,8 +230,8 @@ where
         length: &'a mut usize,
     ) -> SubTrieMut<'a, K, V> {
         SubTrieMut {
-            prefix: prefix,
-            length: length,
+            prefix,
+            length,
             node: self,
         }
     }
@@ -247,7 +241,7 @@ where
     /// or false and a junk value if any test fails.
     pub fn check_integrity_recursive(&self, prefix: &Nibblet) -> (bool, usize) {
         let mut sub_tree_size = 0;
-        let is_root = prefix.len() == 0;
+        let is_root = prefix.is_empty();
 
         // Check that no value-less, non-root nodes have only 1 child.
         if !is_root && self.child_count == 1 && self.key_value.is_none() {
@@ -256,7 +250,7 @@ where
         }
 
         // Check that all non-root key vector's have length > 1.
-        if !is_root && self.key.len() == 0 {
+        if !is_root && self.key.is_empty() {
             println!("Key length is 0 at non-root node.");
             return (false, sub_tree_size);
         }