aboutsummaryrefslogtreecommitdiffstats
path: root/src/serde
diff options
context:
space:
mode:
authorEdward Barnard2017-05-03 13:42:42 +0100
committerEdward Barnard2017-05-03 13:42:42 +0100
commitb1bfd407efbb9b2d58ec26f5323121dce93fcefd (patch)
tree1049e64b75be3b316a49ce54b2de287f6d3a1208 /src/serde
parent9581214eb7d73de2a5b9e25a7c314ac91412e231 (diff)
downloadrust-plist-b1bfd407efbb9b2d58ec26f5323121dce93fcefd.tar.bz2
Rustfmt
Diffstat (limited to 'src/serde')
-rw-r--r--src/serde/de.rs21
-rw-r--r--src/serde/ser.rs4
2 files changed, 13 insertions, 12 deletions
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<I>
expect!(self.events.next(), PlistEvent::StringValue(_));
visitor.visit_none::<Self::Error>()?
}
- 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<I>
_name: &'static str,
_fields: &'static [&'static str],
visitor: V)
- -> Result<V::Value, Self::Error>
+ -> Result<V::Value, Self::Error>
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<I>
}
fn struct_variant<V>(self,
- fields: &'static [&'static str],
- visitor: V)
- -> Result<V::Value, Self::Error>
+ fields: &'static [&'static str],
+ visitor: V)
+ -> Result<V::Value, Self::Error>
where V: de::Visitor<'de>
{
let name = "";
@@ -211,7 +209,7 @@ impl<'de, 'a, I> de::VariantAccess<'de> for &'a mut Deserializer<I>
pub struct StructValueDeserializer<'a, I: 'a>
where I: IntoIterator<Item = Result<PlistEvent, Error>>
{
- de: &'a mut Deserializer<I>
+ de: &'a mut Deserializer<I>,
}
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<V::Value, Self::Error>
+ -> Result<V::Value, Self::Error>
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<Item = Result<PlistEvent, Error>>
{
- fn new(de: &'a mut Deserializer<I>, is_struct: bool, len: Option<usize>) -> MapAndSeqAccess<'a, I> {
+ fn new(de: &'a mut Deserializer<I>,
+ is_struct: bool,
+ len: Option<usize>)
+ -> 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<W: EventWriter> {
// 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<W: EventWriter> Serializer<W> {
@@ -27,7 +27,7 @@ impl<W: EventWriter> Serializer<W> {
Serializer {
writer: writer,
maybe_option_field_name: None,
- expecting_date: false
+ expecting_date: false,
}
}