Merge pull request #26 from sile/support-json-deserialize

Fix deserialization error when using `serde_json`

Cargo.toml

@@ -27,6 +27,7 @@ serde = { version = "1", optional = true }
 clap = { version = "4", features = ["derive"] }
 postcard = { version = "1", features = ["use-std"] }
 rand = "0.8"
+serde_json = { version = "1" }
 
 [package.metadata.docs.rs]
 all-features = true

src/serialization.rs

@@ -217,6 +217,17 @@ impl<'de> Visitor<'de> for BytesVisitor {
     {
         Ok(Bytes(Cow::Owned(v.to_owned())))
     }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'de>,
+    {
+        let mut bytes = Vec::new();
+        while let Some(byte) = seq.next_element()? {
+            bytes.push(byte);
+        }
+        Ok(Bytes(Cow::Owned(bytes)))
+    }
 }
 
 #[cfg(test)]
@@ -240,6 +251,23 @@ mod tests {
         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();
+
+        assert_eq!(map.len(), 3);
+        assert_eq!(map.into_iter().collect::<Vec<_>>(), input);
+    }
+
     #[test]
     fn large_serde_works() {
         let mut input = (0..10000u32)