Merge pull request #33 from little-dude/master

Drop the `postcard` dependency

Author: sile

Cargo.toml

@@ -20,7 +20,6 @@ serde = { version = "1", optional = true }
 
 [dev-dependencies]
 clap = { version = "4", features = ["derive"] }
-postcard = { version = "1", features = ["use-std"] }
 rand = "0.8"
 serde_json = { version = "1" }
 

src/map.rs

@@ -1,6 +1,6 @@
 //! A map based on a patricia tree.
 use crate::node;
-#[cfg(feature = "serde")]
+#[cfg(any(test, feature = "serde"))]
 use crate::node::Node;
 use crate::tree::{self, PatriciaTree};
 use crate::{BorrowedBytes, Bytes};
@@ -105,7 +105,7 @@ impl<K, V> GenericPatriciaMap<K, V> {
         }
     }
 
-    #[cfg(feature = "serde")]
+    #[cfg(any(test, feature = "serde"))]
     pub(crate) fn as_node(&self) -> &Node<V> {
         self.tree.root()
     }

src/serialization.rs

@@ -261,25 +261,8 @@ mod tests {
         input.sort();
 
         let map: PatriciaMap<u32> = input.iter().cloned().collect();
-        let bytes = postcard::to_allocvec(&map).unwrap();
-        let map: PatriciaMap<u32> = postcard::from_bytes(&bytes).unwrap();
-
-        assert_eq!(map.len(), 3);
-        assert_eq!(map.into_iter().collect::<Vec<_>>(), input);
-    }
-
-    #[test]
-    fn serde_json_works() {
-        let mut input = vec![
-            (Vec::from("foo"), 1u32),
-            ("bar".into(), 2),
-            ("baz".into(), 3),
-        ];
-        input.sort();
-
-        let map: PatriciaMap<u32> = input.iter().cloned().collect();
-        let json = serde_json::to_string(&map).unwrap();
-        let map: PatriciaMap<u32> = serde_json::from_str(&json).unwrap();
+        let serialized = serde_json::to_vec(&map).unwrap();
+        let map: PatriciaMap<u32> = serde_json::from_slice(serialized.as_slice()).unwrap();
 
         assert_eq!(map.len(), 3);
         assert_eq!(map.into_iter().collect::<Vec<_>>(), input);
@@ -293,8 +276,8 @@ mod tests {
         input.sort();
 
         let map: PatriciaMap<u32> = input.iter().cloned().collect();
-        let bytes = postcard::to_allocvec(&map).unwrap();
-        let map: PatriciaMap<u32> = postcard::from_bytes(&bytes).unwrap();
+        let serialized = serde_json::to_vec(&map).unwrap();
+        let map: PatriciaMap<u32> = serde_json::from_slice(serialized.as_slice()).unwrap();
 
         assert_eq!(map.len(), 10000);
         assert_eq!(map.into_iter().collect::<Vec<_>>(), input);

src/set.rs

@@ -92,7 +92,7 @@ impl<T> GenericPatriciaSet<T> {
         }
     }
 
-    #[cfg(feature = "serde")]
+    #[cfg(any(test, feature = "serde"))]
     pub(crate) fn as_node(&self) -> &Node<()> {
         self.map.as_node()
     }

src/tree.rs

@@ -16,7 +16,7 @@ impl<V> PatriciaTree<V> {
             len: 0,
         }
     }
-    #[cfg(feature = "serde")]
+    #[cfg(any(test, feature = "serde"))]
     pub fn root(&self) -> &Node<V> {
         &self.root
     }