From b59af483ef96ad4d979f7a31cca1b2157142b3b8 Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Fri, 7 Aug 2015 12:10:02 -0700
Subject: [PATCH] Updated to serde 0.5.0

---
 src/reader_serde.rs | 18 +++++++++---------
 src/writer_serde.rs | 10 ++++------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/reader_serde.rs b/src/reader_serde.rs
index ca630d7..d675a42 100644
--- a/src/reader_serde.rs
+++ b/src/reader_serde.rs
@@ -131,19 +131,19 @@ impl fmt::Display for DeserializeError {
 }
 
 impl serde::de::Error for DeserializeError {
-    fn syntax_error() -> DeserializeError {
+    fn syntax(_: &str) -> DeserializeError {
         DeserializeError::SyntaxError
     }
 
-    fn end_of_stream_error() -> DeserializeError {
+    fn end_of_stream() -> DeserializeError {
         DeserializeError::EndOfStreamError
     }
 
-    fn unknown_field_error(_field: &str) -> DeserializeError {
+    fn unknown_field(_field: &str) -> DeserializeError {
         DeserializeError::UnknownFieldError
     }
 
-    fn missing_field_error(_field: &'static str) -> DeserializeError {
+    fn missing_field(_field: &'static str) -> DeserializeError {
         DeserializeError::MissingFieldError
     }
 }
@@ -213,7 +213,7 @@ impl<'a, R: Read> serde::Deserializer for Deserializer<'a, R> {
     fn visit<V>(&mut self, _visitor: V) -> DeserializeResult<V::Value>
         where V: serde::de::Visitor,
     {
-        Err(serde::de::Error::syntax_error())
+        Err(serde::de::Error::syntax("bincode does not support Deserializer::visit"))
     }
 
     fn visit_bool<V>(&mut self, mut visitor: V) -> DeserializeResult<V::Value>
@@ -252,7 +252,7 @@ impl<'a, R: Read> serde::Deserializer for Deserializer<'a, R> {
         let value = try!(self.reader.read_u64::<BigEndian>());
         match num::cast(value) {
             Some(value) => visitor.visit_usize(value),
-            None => Err(serde::de::Error::syntax_error()),
+            None => Err(serde::de::Error::syntax("expected usize")),
         }
     }
 
@@ -276,7 +276,7 @@ impl<'a, R: Read> serde::Deserializer for Deserializer<'a, R> {
         let value = try!(self.reader.read_i64::<BigEndian>());
         match num::cast(value) {
             Some(value) => visitor.visit_isize(value),
-            None => Err(serde::de::Error::syntax_error()),
+            None => Err(serde::de::Error::syntax("expected isize")),
         }
     }
 
@@ -421,7 +421,7 @@ impl<'a, R: Read> serde::Deserializer for Deserializer<'a, R> {
                 if self.len == 0 {
                     Ok(())
                 } else {
-                    Err(serde::de::Error::syntax_error())
+                    Err(serde::de::Error::syntax("expected end"))
                 }
             }
         }
@@ -465,7 +465,7 @@ impl<'a, R: Read> serde::Deserializer for Deserializer<'a, R> {
                 if self.len == 0 {
                     Ok(())
                 } else {
-                    Err(serde::de::Error::syntax_error())
+                    Err(serde::de::Error::syntax("expected end"))
                 }
             }
         }
diff --git a/src/writer_serde.rs b/src/writer_serde.rs
index 11d127d..bfccddf 100644
--- a/src/writer_serde.rs
+++ b/src/writer_serde.rs
@@ -211,9 +211,8 @@ impl<'a, W: Write> serde::Serializer for Serializer<'a, W> {
         Ok(())
     }
 
-    fn visit_struct_elt<K, V>(&mut self, _key: K, value: V) -> SerializeResult<()>
-        where K: serde::Serialize,
-              V: serde::Serialize,
+    fn visit_struct_elt<V>(&mut self, _key: &str, value: V) -> SerializeResult<()>
+        where V: serde::Serialize,
     {
         value.serialize(self)
     }
@@ -423,9 +422,8 @@ impl serde::Serializer for SizeChecker {
         Ok(())
     }
 
-    fn visit_struct_elt<K, V>(&mut self, _key: K, value: V) -> SerializeResult<()>
-        where K: serde::Serialize,
-              V: serde::Serialize,
+    fn visit_struct_elt<V>(&mut self, _key: &str, value: V) -> SerializeResult<()>
+        where V: serde::Serialize,
     {
         value.serialize(self)
     }