diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/binary/reader.rs | 12 | ||||
| -rw-r--r-- | src/builder.rs | 4 | ||||
| -rw-r--r-- | src/date.rs | 22 | ||||
| -rw-r--r-- | src/serde/de.rs | 21 | ||||
| -rw-r--r-- | src/serde/ser.rs | 4 |
5 files changed, 25 insertions, 38 deletions
diff --git a/src/binary/reader.rs b/src/binary/reader.rs index 097198e..08d0df2 100644 --- a/src/binary/reader.rs +++ b/src/binary/reader.rs @@ -199,18 +199,12 @@ impl<R: Read + Seek> EventReader<R> { (0x0, 0x09) => Some(PlistEvent::BooleanValue(true)), (0x0, 0x0f) => return Err(Error::InvalidData), // fill (0x1, 0) => Some(PlistEvent::IntegerValue(self.reader.read_u8()? as i64)), - (0x1, 1) => { - Some(PlistEvent::IntegerValue(self.reader.read_u16::<BigEndian>()? as i64)) - } - (0x1, 2) => { - Some(PlistEvent::IntegerValue(self.reader.read_u32::<BigEndian>()? as i64)) - } + (0x1, 1) => Some(PlistEvent::IntegerValue(self.reader.read_u16::<BigEndian>()? as i64)), + (0x1, 2) => Some(PlistEvent::IntegerValue(self.reader.read_u32::<BigEndian>()? as i64)), (0x1, 3) => Some(PlistEvent::IntegerValue(self.reader.read_i64::<BigEndian>()?)), (0x1, 4) => return Err(Error::InvalidData), // 128 bit int (0x1, _) => return Err(Error::InvalidData), // variable length int - (0x2, 2) => { - Some(PlistEvent::RealValue(self.reader.read_f32::<BigEndian>()? as f64)) - } + (0x2, 2) => Some(PlistEvent::RealValue(self.reader.read_f32::<BigEndian>()? as f64)), (0x2, 3) => Some(PlistEvent::RealValue(self.reader.read_f64::<BigEndian>()?)), (0x2, _) => return Err(Error::InvalidData), // odd length float (0x3, 3) => { diff --git a/src/builder.rs b/src/builder.rs index 08467af..2398a8b 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -40,9 +40,7 @@ impl<T: Iterator<Item = Result<PlistEvent>>> Builder<T> { fn build_value(&mut self) -> Result<Plist> { match self.token.take() { Some(PlistEvent::StartArray(len)) => Ok(Plist::Array(self.build_array(len)?)), - Some(PlistEvent::StartDictionary(len)) => { - Ok(Plist::Dictionary(self.build_dict(len)?)) - } + Some(PlistEvent::StartDictionary(len)) => Ok(Plist::Dictionary(self.build_dict(len)?)), Some(PlistEvent::BooleanValue(b)) => Ok(Plist::Boolean(b)), Some(PlistEvent::DataValue(d)) => Ok(Plist::Data(d)), diff --git a/src/date.rs b/src/date.rs index 1aa0e72..5089de0 100644 --- a/src/date.rs +++ b/src/date.rs @@ -6,7 +6,7 @@ use {Error, Result}; #[derive(Clone, Debug, PartialEq)] pub struct Date { - inner: DateTime<UTC> + inner: DateTime<UTC>, } impl Date { @@ -29,17 +29,13 @@ impl Date { let plist_epoch = UTC.ymd(2001, 1, 1).and_hms(0, 0, 0); let date = plist_epoch.checked_add_signed(dur).ok_or(Error::InvalidData)?; - Ok(Date { - inner: date - }) + Ok(Date { inner: date }) } } impl From<DateTime<UTC>> for Date { fn from(date: DateTime<UTC>) -> Self { - Date { - inner: date - } + Date { inner: date } } } @@ -60,9 +56,7 @@ impl FromStr for Date { fn from_str(s: &str) -> ::std::result::Result<Self, Self::Err> { let date = DateTime::parse_from_rfc3339(&s).map_err(|_| ())?; - Ok(Date { - inner: date.with_timezone(&UTC) - }) + Ok(Date { inner: date.with_timezone(&UTC) }) } } @@ -77,7 +71,7 @@ mod serde_impls { impl Serialize for Date { fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> - where S: Serializer, + where S: Serializer { let date_str = self.to_string(); serializer.serialize_newtype_struct("PLIST-DATE", &date_str) @@ -94,7 +88,7 @@ mod serde_impls { } fn visit_newtype_struct<D>(self, deserializer: D) -> Result<Self::Value, D::Error> - where D: Deserializer<'de>, + where D: Deserializer<'de> { deserializer.deserialize_str(DateStrVisitor) } @@ -110,7 +104,7 @@ mod serde_impls { } fn visit_str<E>(self, v: &str) -> Result<Self::Value, E> - where E: Error, + where E: Error { Date::from_str(v).map_err(|_| E::invalid_value(Unexpected::Str(v), &self)) } @@ -118,7 +112,7 @@ mod serde_impls { impl<'de> Deserialize<'de> for Date { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> - where D: Deserializer<'de>, + where D: Deserializer<'de> { deserializer.deserialize_newtype_struct("PLIST-DATE", DateNewtypeVisitor) } 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, } } |