Merge branch 'main' into hack/dep-featureflag

src/lib.rs

@@ -55,6 +55,7 @@ use std::ops::Sub;
 use std::ops::SubAssign;
 #[cfg(feature = "parser")]
 use std::str::FromStr;
+use std::time::SystemTime;
 
 use chrono::format::DelayedFormat;
 use chrono::format::StrftimeItems;
@@ -170,12 +171,12 @@ impl Time {
             .map(|chrono_datetime| Time::millis(chrono_datetime.timestamp_millis()))
     }
 
-    /// Returns the current time instance.
+    /// Returns the current time instance based on `SystemTime`
     ///
     /// Don't use this method to compare if the current time has passed a
     /// certain deadline.
     pub fn now() -> Time {
-        Time::millis(chrono::Local::now().timestamp_millis())
+        Time::from(SystemTime::now())
     }
 
     pub fn as_millis(&self) -> i64 {
@@ -335,6 +336,18 @@ impl From<Time> for std::time::SystemTime {
     }
 }
 
+impl From<std::time::SystemTime> for Time {
+    fn from(input: std::time::SystemTime) -> Self {
+        if input > SystemTime::UNIX_EPOCH {
+            let std_dur = input.duration_since(SystemTime::UNIX_EPOCH).unwrap();
+            Self::millis(Duration::from(std_dur).as_millis())
+        } else {
+            let std_dur = SystemTime::UNIX_EPOCH.duration_since(input).unwrap();
+            Self::millis(-Duration::from(std_dur).as_millis())
+        }
+    }
+}
+
 impl Debug for Time {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         // This implementation is tailor-made, because NaiveDateTime does not support