From 0cc6dc9960ebb8415f2e73f210e61d8db0d9b3fa Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 20 Apr 2017 10:16:00 -0700 Subject: Support serde 1.0.0 --- src/datetime.rs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/datetime.rs') diff --git a/src/datetime.rs b/src/datetime.rs index b3c82d6..7917cad 100644 --- a/src/datetime.rs +++ b/src/datetime.rs @@ -315,13 +315,13 @@ impl ser::Serialize for Datetime { } } -impl de::Deserialize for Datetime { +impl<'de> de::Deserialize<'de> for Datetime { fn deserialize(deserializer: D) -> Result - where D: de::Deserializer + where D: de::Deserializer<'de> { struct DatetimeVisitor; - impl de::Visitor for DatetimeVisitor { + impl<'de> de::Visitor<'de> for DatetimeVisitor { type Value = Datetime; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -329,13 +329,13 @@ impl de::Deserialize for Datetime { } fn visit_map(self, mut visitor: V) -> Result - where V: de::MapVisitor + where V: de::MapAccess<'de> { - let value = visitor.visit_key::()?; + let value = visitor.next_key::()?; if value.is_none() { return Err(de::Error::custom("datetime key not found")) } - let v: DatetimeFromString = visitor.visit_value()?; + let v: DatetimeFromString = visitor.next_value()?; Ok(v.value) } @@ -350,13 +350,13 @@ impl de::Deserialize for Datetime { struct DatetimeKey; -impl de::Deserialize for DatetimeKey { +impl<'de> de::Deserialize<'de> for DatetimeKey { fn deserialize(deserializer: D) -> Result - where D: de::Deserializer + where D: de::Deserializer<'de> { struct FieldVisitor; - impl de::Visitor for FieldVisitor { + impl<'de> de::Visitor<'de> for FieldVisitor { type Value = (); fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -374,7 +374,7 @@ impl de::Deserialize for DatetimeKey { } } - deserializer.deserialize_struct_field(FieldVisitor)?; + deserializer.deserialize_identifier(FieldVisitor)?; Ok(DatetimeKey) } } @@ -383,13 +383,13 @@ pub struct DatetimeFromString { pub value: Datetime, } -impl de::Deserialize for DatetimeFromString { +impl<'de> de::Deserialize<'de> for DatetimeFromString { fn deserialize(deserializer: D) -> Result - where D: de::Deserializer + where D: de::Deserializer<'de> { struct Visitor; - impl de::Visitor for Visitor { + impl<'de> de::Visitor<'de> for Visitor { type Value = DatetimeFromString; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { -- cgit v1.2.3