-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Large refactor and replacement of to_timezone by a new ToTimezone tra…
…it to support multiple possible inputs
- Loading branch information
Showing
11 changed files
with
221 additions
and
157 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| // Copyright (c) 2023, Yuri6037 | ||
| // | ||
| // All rights reserved. | ||
| // | ||
| // Redistribution and use in source and binary forms, with or without modification, | ||
| // are permitted provided that the following conditions are met: | ||
| // | ||
| // * Redistributions of source code must retain the above copyright notice, | ||
| // this list of conditions and the following disclaimer. | ||
| // * Redistributions in binary form must reproduce the above copyright notice, | ||
| // this list of conditions and the following disclaimer in the documentation | ||
| // and/or other materials provided with the distribution. | ||
| // * Neither the name of time-tz nor the names of its contributors | ||
| // may be used to endorse or promote products derived from this software | ||
| // without specific prior written permission. | ||
| // | ||
| // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||
| // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
| // EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
| // PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
| // PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
| // LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
| // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| use time::{OffsetDateTime, PrimitiveDateTime}; | ||
|
|
||
| use crate::{TimeZone, zoned, OffsetResult, Offset, timezones, ToTimezone}; | ||
|
|
||
| mod sealing { | ||
| pub trait OffsetDateTimeExt {} | ||
| pub trait PrimitiveDateTimeExt {} | ||
|
|
||
| impl OffsetDateTimeExt for time::OffsetDateTime {} | ||
| impl PrimitiveDateTimeExt for time::PrimitiveDateTime {} | ||
| } | ||
|
|
||
| // This trait is sealed and is only implemented in this library. | ||
| pub trait OffsetDateTimeExt: sealing::OffsetDateTimeExt { | ||
| /// Converts this [OffsetDateTime](time::OffsetDateTime) to UTC. | ||
| fn to_utc(&self) -> OffsetDateTime; | ||
|
|
||
| /// Creates a new [ZonedDateTime](crate::ZonedDateTime) from this [OffsetDateTime](time::OffsetDateTime). | ||
| /// | ||
| /// # Arguments | ||
| /// | ||
| /// * `tz`: the target timezone. | ||
| fn with_timezone<'a, T: TimeZone>(&self, tz: &'a T) -> zoned::ZonedDateTime<'a, T>; | ||
| } | ||
|
|
||
| /// This trait is sealed and is only implemented in this library. | ||
| pub trait PrimitiveDateTimeExt: sealing::PrimitiveDateTimeExt { | ||
| /// Creates a new [OffsetDateTime](time::OffsetDateTime) from a [PrimitiveDateTime](time::PrimitiveDateTime) by assigning the main offset of the | ||
| /// target timezone. | ||
| /// | ||
| /// *This assumes the [PrimitiveDateTime](time::PrimitiveDateTime) is already in the target timezone.* | ||
| /// | ||
| /// # Arguments | ||
| /// | ||
| /// * `tz`: the target timezone. | ||
| /// | ||
| /// returns: `OffsetResult<OffsetDateTime>` | ||
| fn assume_timezone<T: TimeZone>(&self, tz: &T) -> OffsetResult<OffsetDateTime>; | ||
|
|
||
| /// Creates a new [OffsetDateTime](time::OffsetDateTime) with the proper offset in the given timezone. | ||
| /// | ||
| /// *This assumes the [PrimitiveDateTime](time::PrimitiveDateTime) is in UTC offset.* | ||
| /// | ||
| /// # Arguments | ||
| /// | ||
| /// * `tz`: the target timezone. | ||
| /// | ||
| /// returns: OffsetDateTime | ||
| fn assume_timezone_utc<T: TimeZone>(&self, tz: &T) -> OffsetDateTime; | ||
|
|
||
| /// Creates a new [ZonedDateTime](crate::ZonedDateTime) from this [PrimitiveDateTime](time::PrimitiveDateTime). | ||
| /// | ||
| /// *This assumes the [PrimitiveDateTime](time::PrimitiveDateTime) is already in the target timezone.* | ||
| /// | ||
| /// # Arguments | ||
| /// | ||
| /// * `tz`: the target timezone. | ||
| fn with_timezone<'a, T: TimeZone>(self, tz: &'a T) -> OffsetResult<zoned::ZonedDateTime<'a, T>>; | ||
| } | ||
|
|
||
| impl PrimitiveDateTimeExt for PrimitiveDateTime { | ||
| fn assume_timezone<T: TimeZone>(&self, tz: &T) -> OffsetResult<OffsetDateTime> { | ||
| match tz.get_offset_local(&self.assume_utc()) { | ||
| OffsetResult::Some(a) => OffsetResult::Some(self.assume_offset(a.to_utc())), | ||
| OffsetResult::Ambiguous(a, b) => OffsetResult::Ambiguous( | ||
| self.assume_offset(a.to_utc()), | ||
| self.assume_offset(b.to_utc()), | ||
| ), | ||
| OffsetResult::None => OffsetResult::None, | ||
| } | ||
| } | ||
|
|
||
| fn assume_timezone_utc<T: TimeZone>(&self, tz: &T) -> OffsetDateTime { | ||
| let offset = tz.get_offset_utc(&self.assume_utc()); | ||
| self.assume_offset(offset.to_utc()) | ||
| } | ||
|
|
||
| fn with_timezone<'a, T: TimeZone>(self, tz: &'a T) -> OffsetResult<zoned::ZonedDateTime<'a, T>> { | ||
| zoned::ZonedDateTime::from_local(self, tz) | ||
| } | ||
| } | ||
|
|
||
| impl OffsetDateTimeExt for OffsetDateTime { | ||
| fn to_utc(&self) -> OffsetDateTime { | ||
| if self.offset().is_utc() { | ||
| *self | ||
| } else { | ||
| self.to_timezone(timezones::db::UTC) | ||
| } | ||
| } | ||
|
|
||
| fn with_timezone<'a, T: TimeZone>(&self, tz: &'a T) -> zoned::ZonedDateTime<'a, T> { | ||
| zoned::ZonedDateTime::from_utc(self.to_utc(), tz) | ||
| } | ||
| } | ||
|
|
||
| impl<T: TimeZone> ToTimezone<&T> for OffsetDateTime { | ||
| type Out = OffsetDateTime; | ||
|
|
||
| fn to_timezone(&self, tz: &T) -> OffsetDateTime { | ||
| let offset = tz.get_offset_utc(self); | ||
| self.to_offset(offset.to_utc()) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.