diff options
| author | Robin Stocker | 2017-08-22 05:29:28 +1000 |
|---|---|---|
| committer | Ed Barnard | 2017-08-21 20:29:28 +0100 |
| commit | 33f92308e8fe3f88a80b11eb7b2dee1d27977443 (patch) | |
| tree | 84251c18df98cefad6a2bb7c4b4d8aa10cbef78a /src/date.rs | |
| parent | b0d6118889409aa6fb13a7855d5ede17c3d11cc1 (diff) | |
| download | rust-plist-33f92308e8fe3f88a80b11eb7b2dee1d27977443.tar.bz2 | |
Upgrade chrono from 0.3 to 0.4 (#23)
Diffstat (limited to 'src/date.rs')
| -rw-r--r-- | src/date.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/date.rs b/src/date.rs index 55aa205..4091f28 100644 --- a/src/date.rs +++ b/src/date.rs @@ -1,4 +1,4 @@ -use chrono::{DateTime, Duration, TimeZone, UTC}; +use chrono::{DateTime, Duration, TimeZone, Utc}; use std::fmt; use std::str::FromStr; @@ -7,7 +7,7 @@ use {Error, Result}; /// A UTC timestamp. Used for serialization to and from the plist date type. #[derive(Clone, Debug, PartialEq)] pub struct Date { - inner: DateTime<UTC>, + inner: DateTime<Utc>, } impl Date { @@ -32,21 +32,21 @@ impl Date { let dur = Duration::milliseconds(whole_millis as i64); let dur = dur + Duration::nanoseconds(submilli_nanos as i64); - let plist_epoch = UTC.ymd(2001, 1, 1).and_hms(0, 0, 0); + 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 }) } } -impl From<DateTime<UTC>> for Date { - fn from(date: DateTime<UTC>) -> Self { +impl From<DateTime<Utc>> for Date { + fn from(date: DateTime<Utc>) -> Self { Date { inner: date } } } -impl Into<DateTime<UTC>> for Date { - fn into(self) -> DateTime<UTC> { +impl Into<DateTime<Utc>> for Date { + fn into(self) -> DateTime<Utc> { self.inner } } @@ -62,7 +62,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) }) } } |
