cleanup(build): fix deprecated NaiveDateTime uses

Author: arxanas

git-branchless-lib/src/git/object.rs

@@ -222,7 +222,7 @@ impl<'repo> Commit<'repo> {
     /// its OID, author, commit time, and message.
     #[instrument]
     pub fn friendly_preview(&self) -> Result<StyledString> {
-        let commit_time = self.get_time().to_naive_date_time();
+        let commit_time = self.get_time().to_date_time();
         let preview = StyledStringBuilder::from_lines(vec![
             StyledStringBuilder::new()
                 .append_styled(

git-branchless-lib/src/git/repo.rs

@@ -19,7 +19,7 @@ use std::time::{Duration, SystemTime};
 use std::{io, time};
 
 use bstr::ByteVec;
-use chrono::NaiveDateTime;
+use chrono::{DateTime, Utc};
 use cursive::theme::BaseColor;
 use cursive::utils::markup::StyledString;
 use git2::DiffOptions;
@@ -1737,8 +1737,8 @@ impl Time {
         )))
     }
 
-    /// Calculate the associated [`NaiveDateTime`].
-    pub fn to_naive_date_time(&self) -> Option<NaiveDateTime> {
-        NaiveDateTime::from_timestamp_opt(self.inner.seconds(), 0)
+    /// Calculate the associated [`DateTime`].
+    pub fn to_date_time(&self) -> Option<DateTime<Utc>> {
+        DateTime::from_timestamp(self.inner.seconds(), 0)
     }
 }

git-branchless-revset/src/pattern.rs

@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 use std::sync::{Arc, Mutex};
 
-use chrono::{Local, NaiveDateTime};
+use chrono::{DateTime, Local};
 use chrono_english::{parse_date_string, parse_duration, DateError, Dialect, Interval};
 use chronoutil::RelativeDuration;
 use eden_dag::nameset::hints::{Flags, Hints};
@@ -22,8 +22,8 @@ pub(super) enum Pattern {
     Substring(String),
     Glob(glob::Pattern),
     Regex(regex::Regex),
-    Before(NaiveDateTime),
-    After(NaiveDateTime),
+    Before(DateTime<Local>),
+    After(DateTime<Local>),
 }
 
 #[derive(Debug, Error)]
@@ -64,11 +64,11 @@ impl Pattern {
             Pattern::Exact(_) | Pattern::Substring(_) | Pattern::Glob(_) | Pattern::Regex(_) => {
                 false
             }
-            Pattern::Before(date) => match time.to_naive_date_time() {
+            Pattern::Before(date) => match time.to_date_time() {
                 Some(time) => &time <= date,
                 None => false,
             },
-            Pattern::After(date) => match time.to_naive_date_time() {
+            Pattern::After(date) => match time.to_date_time() {
                 Some(time) => &time >= date,
                 None => false,
             },
@@ -94,17 +94,17 @@ impl Pattern {
             return Ok(Pattern::Regex(pattern));
         }
 
-        fn parse_date(pattern: &str) -> Result<NaiveDateTime, PatternError> {
+        fn parse_date(pattern: &str) -> Result<DateTime<Local>, PatternError> {
             if let Ok(date) = parse_date_string(pattern, Local::now(), Dialect::Us) {
-                return Ok(date.naive_local());
+                return Ok(date.with_timezone(&Local));
             }
             if let Ok(interval) = parse_duration(pattern) {
                 let delta = match interval {
                     Interval::Seconds(seconds) => RelativeDuration::seconds(seconds.into()),
                     Interval::Days(days) => RelativeDuration::days(days.into()),
                     Interval::Months(months) => RelativeDuration::months(months),
                 };
-                let date = Local::now().naive_local() + delta;
+                let date = Local::now() + delta;
                 return Ok(date);
             }
             Err(PatternError::ConstructMatcher(eyre::eyre!(