diff options
| author | Edward Barnard | 2017-05-03 13:42:42 +0100 |
|---|---|---|
| committer | Edward Barnard | 2017-05-03 13:42:42 +0100 |
| commit | b1bfd407efbb9b2d58ec26f5323121dce93fcefd (patch) | |
| tree | 1049e64b75be3b316a49ce54b2de287f6d3a1208 /src/date.rs | |
| parent | 9581214eb7d73de2a5b9e25a7c314ac91412e231 (diff) | |
| download | rust-plist-b1bfd407efbb9b2d58ec26f5323121dce93fcefd.tar.bz2 | |
Rustfmt
Diffstat (limited to 'src/date.rs')
| -rw-r--r-- | src/date.rs | 22 |
1 files changed, 8 insertions, 14 deletions
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) } |
