From b1bfd407efbb9b2d58ec26f5323121dce93fcefd Mon Sep 17 00:00:00 2001 From: Edward Barnard Date: Wed, 3 May 2017 13:42:42 +0100 Subject: Rustfmt --- src/serde/de.rs | 21 +++++++++++---------- src/serde/ser.rs | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'src/serde') diff --git a/src/serde/de.rs b/src/serde/de.rs index dd7f829..e43fb7e 100644 --- a/src/serde/de.rs +++ b/src/serde/de.rs @@ -116,9 +116,7 @@ impl<'de, 'a, I> de::Deserializer<'de> for &'a mut Deserializer expect!(self.events.next(), PlistEvent::StringValue(_)); visitor.visit_none::()? } - PlistEvent::StringValue(ref s) if &s[..] == "Some" => { - visitor.visit_some(&mut *self)? - } + PlistEvent::StringValue(ref s) if &s[..] == "Some" => visitor.visit_some(&mut *self)?, _ => return Err(event_mismatch_error()), }; @@ -140,7 +138,7 @@ impl<'de, 'a, I> de::Deserializer<'de> for &'a mut Deserializer _name: &'static str, _fields: &'static [&'static str], visitor: V) - -> Result + -> Result where V: de::Visitor<'de> { expect!(self.events.next(), PlistEvent::StartDictionary(_)); @@ -198,9 +196,9 @@ impl<'de, 'a, I> de::VariantAccess<'de> for &'a mut Deserializer } fn struct_variant(self, - fields: &'static [&'static str], - visitor: V) - -> Result + fields: &'static [&'static str], + visitor: V) + -> Result where V: de::Visitor<'de> { let name = ""; @@ -211,7 +209,7 @@ impl<'de, 'a, I> de::VariantAccess<'de> for &'a mut Deserializer pub struct StructValueDeserializer<'a, I: 'a> where I: IntoIterator> { - de: &'a mut Deserializer + de: &'a mut Deserializer, } impl<'de, 'a, I> de::Deserializer<'de> for StructValueDeserializer<'a, I> @@ -257,7 +255,7 @@ impl<'de, 'a, I> de::Deserializer<'de> for StructValueDeserializer<'a, I> name: &'static str, fields: &'static [&'static str], visitor: V) - -> Result + -> Result where V: de::Visitor<'de> { self.de.deserialize_struct(name, fields, visitor) @@ -285,7 +283,10 @@ struct MapAndSeqAccess<'a, I> impl<'a, I> MapAndSeqAccess<'a, I> where I: 'a + IntoIterator> { - fn new(de: &'a mut Deserializer, is_struct: bool, len: Option) -> MapAndSeqAccess<'a, I> { + fn new(de: &'a mut Deserializer, + is_struct: bool, + len: Option) + -> MapAndSeqAccess<'a, I> { MapAndSeqAccess { de: de, is_struct: is_struct, diff --git a/src/serde/ser.rs b/src/serde/ser.rs index a77dc23..f19093b 100644 --- a/src/serde/ser.rs +++ b/src/serde/ser.rs @@ -19,7 +19,7 @@ pub struct Serializer { // fields are represented in plists. This is fragile but results in minimal code duplication. // TODO: This is fragile. Use distinct types instead. maybe_option_field_name: Option<&'static str>, - expecting_date: bool + expecting_date: bool, } impl Serializer { @@ -27,7 +27,7 @@ impl Serializer { Serializer { writer: writer, maybe_option_field_name: None, - expecting_date: false + expecting_date: false, } } -- cgit v1.2.3