Merge pull request #232 from elrnv/deserialize_bytes

Deserialize bytes

Author: tafia

src/de/mod.rs

@@ -332,11 +332,15 @@ impl<'de, 'a, R: BufRead> de::Deserializer<'de> for &'a mut Deserializer<R> {
     }
 
     fn deserialize_bytes<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value, DeError> {
-        self.deserialize_string(visitor)
+        let text = self.next_text()?;
+        let value = text.escaped();
+        visitor.visit_bytes(value)
     }
 
     fn deserialize_byte_buf<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value, DeError> {
-        self.deserialize_string(visitor)
+        let text = self.next_text()?;
+        let value = text.into_inner().into_owned();
+        visitor.visit_byte_buf(value)
     }
 
     fn deserialize_unit<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value, DeError> {
@@ -566,4 +570,45 @@ mod tests {
             }
         );
     }
+
+    #[test]
+    fn deserialize_bytes() {
+        #[derive(Debug, PartialEq)]
+        struct Item {
+            bytes: Vec<u8>,
+        }
+
+        impl<'de> Deserialize<'de> for Item {
+            fn deserialize<D>(d: D) -> Result<Self, D::Error>
+            where
+                D: serde::de::Deserializer<'de>,
+            {
+                struct ItemVisitor;
+
+                impl<'de> de::Visitor<'de> for ItemVisitor {
+                    type Value = Item;
+
+                    fn expecting(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
+                        fmt.write_str("byte data")
+                    }
+
+                    fn visit_byte_buf<E: de::Error>(self, v: Vec<u8>) -> Result<Self::Value, E> {
+                        Ok(Item { bytes: v })
+                    }
+                }
+
+                Ok(d.deserialize_byte_buf(ItemVisitor)?)
+            }
+        }
+
+        let s = r#"<item>bytes</item>"#;
+        let item: Item = from_reader(s.as_bytes()).unwrap();
+
+        assert_eq!(
+            item,
+            Item {
+                bytes: "bytes".as_bytes().to_vec(),
+            }
+        );
+    }
 }

src/events/mod.rs

@@ -472,6 +472,13 @@ impl<'a> BytesText<'a> {
         }
     }
 
+    /// Extracts the inner `Cow` from the `BytesText` event container.
+    #[cfg(feature = "serialize")]
+    #[inline]
+    pub(crate) fn into_inner(self) -> Cow<'a, [u8]> {
+        self.content
+    }
+
     /// gets escaped content
     ///
     /// Searches for '&' into content and try to escape the coded character if possible