From 563518850e450f91751fc4e434af9387310cab2f Mon Sep 17 00:00:00 2001
From: Matt Bilker <me@mbilker.us>
Date: Thu, 19 Jul 2018 03:15:24 +0000
Subject: [PATCH] de: fix deserialize_any and support byte arrays

---
 src/de/mod.rs | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/de/mod.rs b/src/de/mod.rs
index f4600e6..12b0a04 100644
--- a/src/de/mod.rs
+++ b/src/de/mod.rs
@@ -121,17 +121,13 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
   {
     trace!("Deserializer::deserialize_any()");
 
-    let (node_type, _is_array) = self.reader.peek_node_type()?;
+    let (node_type, _is_array) = self.reader.last_node_type().ok_or(KbinErrorKind::InvalidState)?;
     debug!("Deserializer::deserialize_any() => node_type: {:?}", node_type);
 
     let value = match node_type {
       StandardType::Attribute |
-      StandardType::NodeStart => {
-        let _ = self.reader.read_node_type()?;
-        self.deserialize_identifier(visitor)
-      },
-      StandardType::Binary => self.deserialize_bytes(visitor),
       StandardType::String => self.deserialize_string(visitor),
+      StandardType::Binary => self.deserialize_bytes(visitor),
       StandardType::U8 => self.deserialize_u8(visitor),
       StandardType::U16 => self.deserialize_u16(visitor),
       StandardType::U32 => self.deserialize_u32(visitor),
@@ -140,6 +136,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
       StandardType::S16 => self.deserialize_i16(visitor),
       StandardType::S32 => self.deserialize_i32(visitor),
       StandardType::S64 => self.deserialize_i64(visitor),
+      StandardType::NodeStart => self.deserialize_identifier(visitor),
       StandardType::NodeEnd => visitor.visit_none(),
       _ => unimplemented!(),
     };
@@ -184,8 +181,21 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
     visitor.visit_string(self.reader.read_string()?)
   }
 
-  implement_type!(deserialize_bytes);
-  implement_type!(deserialize_byte_buf);
+  fn deserialize_bytes<V>(self, visitor: V) -> Result<V::Value>
+    where V: Visitor<'de>
+  {
+    trace!("Deserializer::deserialize_bytes()");
+
+    visitor.visit_bytes(self.reader.read_bytes()?)
+  }
+
+  fn deserialize_byte_buf<V>(self, visitor: V) -> Result<V::Value>
+    where V: Visitor<'de>
+  {
+    trace!("Deserializer::deserialize_byte_buf()");
+
+    visitor.visit_byte_buf(self.reader.read_bytes()?.to_vec())
+  }
 
   fn deserialize_option<V>(self, visitor: V) -> Result<V::Value>
     where V: Visitor<'de>