berkus
/
bincode
mirror of https://git.sr.ht/~stygianentity/bincode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated to serde 0.5.0

This commit is contained in:
Erick Tryzelaar 2015-08-07 12:10:02 -07:00
parent f04635c1ba
commit b59af483ef
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/reader_serde.rs
View File

@ -131,19 +131,19 @@ impl fmt::Display for DeserializeError {
} }
impl serde::de::Error for DeserializeError { impl serde::de::Error for DeserializeError {
fn syntax_error() -> DeserializeError { fn syntax(_: &str) -> DeserializeError {
DeserializeError::SyntaxError DeserializeError::SyntaxError
} }
fn end_of_stream_error() -> DeserializeError { fn end_of_stream() -> DeserializeError {
DeserializeError::EndOfStreamError DeserializeError::EndOfStreamError
} }
fn unknown_field_error(_field: &str) -> DeserializeError { fn unknown_field(_field: &str) -> DeserializeError {
DeserializeError::UnknownFieldError DeserializeError::UnknownFieldError
} }
fn missing_field_error(_field: &'static str) -> DeserializeError { fn missing_field(_field: &'static str) -> DeserializeError {
DeserializeError::MissingFieldError 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> fn visit<V>(&mut self, _visitor: V) -> DeserializeResult<V::Value>
where V: serde::de::Visitor, 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> 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>()); let value = try!(self.reader.read_u64::<BigEndian>());
match num::cast(value) { match num::cast(value) {
Some(value) => visitor.visit_usize(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>()); let value = try!(self.reader.read_i64::<BigEndian>());
match num::cast(value) { match num::cast(value) {
Some(value) => visitor.visit_isize(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 { if self.len == 0 {
Ok(()) Ok(())
} else { } 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 { if self.len == 0 {
Ok(()) Ok(())
} else { } else {
Err(serde::de::Error::syntax_error()) Err(serde::de::Error::syntax("expected end"))
} }
} }
} }

10
src/writer_serde.rs
View File

@ -211,9 +211,8 @@ impl<'a, W: Write> serde::Serializer for Serializer<'a, W> {
Ok(()) Ok(())
} }
fn visit_struct_elt<K, V>(&mut self, _key: K, value: V) -> SerializeResult<()> fn visit_struct_elt<V>(&mut self, _key: &str, value: V) -> SerializeResult<()>
where K: serde::Serialize, where V: serde::Serialize,
V: serde::Serialize,
{ {
value.serialize(self) value.serialize(self)
} }
@ -423,9 +422,8 @@ impl serde::Serializer for SizeChecker {
Ok(()) Ok(())
} }
fn visit_struct_elt<K, V>(&mut self, _key: K, value: V) -> SerializeResult<()> fn visit_struct_elt<V>(&mut self, _key: &str, value: V) -> SerializeResult<()>
where K: serde::Serialize, where V: serde::Serialize,
V: serde::Serialize,
{ {
value.serialize(self) value.serialize(self)
} }