Replace time with jiff

This wasn't planned, but `time` (despite being pulled as our own dependency)
stopped working. Maybe it wasn't new enough anymore?

Cargo.toml

@@ -32,11 +32,11 @@ cargo_metadata = "0.18.0"
 log = "0.4.14"
 toml_edit = "0.21.0"
 semver = "1.0.4"
-crates-index = { version = "2.2.0", default-features = false, features = ["git-performance", "git-https"] }
+crates-index = { version = "3.2.0", default-features = false, features = ["git-performance", "git-https"] }
 cargo_toml = "0.17.2"
 winnow = "0.5.12"
 git-conventional = "0.12.0"
-time = "0.3.23"
+jiff = "0.1.8"
 pulldown-cmark = "0.9.0"
 bitflags = "2"
 

src/changelog/mod.rs

@@ -26,7 +26,7 @@ pub enum Section {
     /// A segment describing a particular release
     Release {
         name: Version,
-        date: Option<time::OffsetDateTime>,
+        date: Option<jiff::Zoned>,
         /// the amount of # in front of the heading denoting the release name
         heading_level: usize,
         /// What came right before the version

src/changelog/parse.rs

@@ -459,7 +459,7 @@ struct Headline {
     level: usize,
     version_prefix: String,
     version: Option<semver::Version>,
-    date: Option<time::OffsetDateTime>,
+    date: Option<jiff::Zoned>,
 }
 
 impl<'a> TryFrom<&'a str> for Headline {
@@ -496,11 +496,9 @@ fn headline<'a, E: ParserError<&'a str> + FromExternalError<&'a str, ()>>(i: &mu
                     "(",
                     (take_n_digits(4), "-", take_n_digits(2), "-", take_n_digits(2)).try_map(
                         |(year, _, month, _, day)| {
-                            time::Month::try_from(month as u8).map_err(|_| ()).and_then(|month| {
-                                time::Date::from_calendar_date(year as i32, month, day as u8)
-                                    .map_err(|_| ())
-                                    .map(|d| d.midnight().assume_utc())
-                            })
+                            jiff::civil::Date::new(year as i16, month as i8, day as i8)
+                                .map_err(|_| ())
+                                .and_then(|d| d.to_zoned(jiff::tz::TimeZone::UTC).map_err(|_| ()))
                         },
                     ),
                     ")",

src/changelog/section/from_history.rs

@@ -2,7 +2,6 @@ use std::{collections::BTreeMap, ops::Sub};
 
 use cargo_metadata::Package;
 use gix::prelude::ObjectIdExt;
-use time::OffsetDateTime;
 
 use crate::{
     changelog,
@@ -12,7 +11,7 @@ use crate::{
         Section,
     },
     commit, utils,
-    utils::{is_top_level_package, time_to_offset_date_time},
+    utils::{is_top_level_package, time_to_zoned_time},
 };
 
 impl Section {
@@ -91,12 +90,12 @@ impl Section {
             {
                 let duration = history
                     .last()
-                    .map(|last| date_time.sub(time_to_offset_date_time(last.commit_time)));
+                    .map(|last| date_time.sub(&time_to_zoned_time(last.commit_time).expect("valid time")));
                 segments.push(Segment::Statistics(section::Data::Generated(
                     section::segment::CommitStatistics {
                         count: history.len(),
                         duration,
-                        time_passed_since_last_release: prev_date_time.map(|prev_time| date_time.sub(prev_time)),
+                        time_passed_since_last_release: prev_date_time.map(|prev_time| date_time.sub(&prev_time)),
                         conventional_count: history.iter().filter(|item| item.message.kind.is_some()).count(),
                         unique_issues: {
                             let mut v = commits_by_category
@@ -158,7 +157,7 @@ impl Section {
     }
 }
 
-fn segment_head_time(segment: &commit::history::Segment<'_>, repo: &gix::Repository) -> OffsetDateTime {
+fn segment_head_time(segment: &commit::history::Segment<'_>, repo: &gix::Repository) -> jiff::Zoned {
     let time = segment
         .head
         .peeled
@@ -170,5 +169,5 @@ fn segment_head_time(segment: &commit::history::Segment<'_>, repo: &gix::Reposit
         .committer
         .time;
 
-    time_to_offset_date_time(time)
+    time_to_zoned_time(time).expect("always valid time")
 }

src/changelog/section/segment.rs

@@ -110,13 +110,13 @@ pub struct CommitStatistics {
     /// Amount of commits that contributed to the release
     pub count: usize,
     /// The time span from first to last commit, if there is more than one.
-    pub duration: Option<time::Duration>,
+    pub duration: Option<jiff::Span>,
     /// Amount of commits that could be parsed as git-conventional
     pub conventional_count: usize,
     /// The issue numbers that were referenced in commit messages
     pub unique_issues: Vec<details::Category>,
     /// The duration from the release before this one, if this isn't the first release.
-    pub time_passed_since_last_release: Option<time::Duration>,
+    pub time_passed_since_last_release: Option<jiff::Span>,
 }
 
 impl CommitStatistics {

src/changelog/write.rs

@@ -320,20 +320,20 @@ impl section::Segment {
                     count,
                     if *count == 1 { "commit" } else { "commits" },
                     match duration {
-                        Some(duration) if duration.whole_days() > 0 => format!(
+                        Some(duration) if duration.get_days() > 0 => format!(
                             " over the course of {} calendar {}.",
-                            duration.whole_days(),
-                            if duration.whole_days() == 1 { "day" } else { "days" }
+                            duration.get_days(),
+                            if duration.get_days() == 1 { "day" } else { "days" }
                         ),
                         _ => ".".into(),
                     }
                 )?;
-                if let Some(time_between_releases) = time_passed_since_last_release.filter(|d| d.whole_days() > 0) {
+                if let Some(time_between_releases) = time_passed_since_last_release.filter(|d| d.get_days() > 0) {
                     writeln!(
                         out,
                         " - {} {} passed between releases.",
-                        time_between_releases.whole_days(),
-                        if time_between_releases.whole_days() == 1 {
+                        time_between_releases.get_days(),
+                        if time_between_releases.get_days() == 1 {
                             "day"
                         } else {
                             "days"

src/cli/main.rs

@@ -8,8 +8,6 @@ fn main() -> anyhow::Result<()> {
     unsafe {
         // SAFETY: We do nothing that could block.
         gix::interrupt::init_handler(2, || {})?;
-        // SAFETY: we don't manipulate the environment from any thread
-        time::util::local_offset::set_soundness(time::util::local_offset::Soundness::Unsound);
     }
     let args: Args = Args::parse();
     match args.subcommands {

src/command/release/manifest.rs

@@ -387,7 +387,7 @@ fn gather_changelog_data<'meta>(
         release_section_by_publishee,
         made_change,
     } = &mut out;
-    let next_commit_date = crate::utils::time_to_offset_date_time(crate::git::author()?.time);
+    let next_commit_date = crate::utils::time_to_zoned_time(crate::git::author()?.time).expect("valid time");
     for (publishee, new_version) in crates_and_versions_to_be_published {
         let lock = gix::lock::File::acquire_to_update_resource(
             &publishee.manifest_path,
@@ -431,7 +431,7 @@ fn gather_changelog_data<'meta>(
                         );
                     }
                     *name = changelog::Version::Semantic((*new_version).to_owned());
-                    *date = Some(next_commit_date);
+                    *date = Some(next_commit_date.clone());
                     let recent_section = log.sections.remove(recent_idx);
                     match log
                         .sections
@@ -457,7 +457,7 @@ fn gather_changelog_data<'meta>(
                             recent_version
                         );
                     }
-                    *date = Some(next_commit_date);
+                    *date = Some(next_commit_date.clone());
                 }
                 changelog::Section::Verbatim { .. } => unreachable!("BUG: checked in prior function"),
             };

src/utils.rs

@@ -7,7 +7,6 @@ use cargo_metadata::{
 };
 use gix::bstr::{BStr, ByteSlice};
 use semver::{Version, VersionReq};
-use time::OffsetDateTime;
 
 pub struct Program {
     pub found: bool,
@@ -157,10 +156,8 @@ pub fn component_to_bytes(c: Utf8Component<'_>) -> &[u8] {
     }
 }
 
-pub fn time_to_offset_date_time(time: gix::date::Time) -> OffsetDateTime {
-    time::OffsetDateTime::from_unix_timestamp(time.seconds)
-        .expect("always valid unix time")
-        .replace_offset(time::UtcOffset::from_whole_seconds(time.offset).expect("valid offset"))
+pub fn time_to_zoned_time(time: gix::date::Time) -> anyhow::Result<jiff::Zoned> {
+    Ok(jiff::Timestamp::new(time.seconds, 0)?.to_zoned(jiff::tz::Offset::from_seconds(time.offset)?.to_time_zone()))
 }
 
 #[cfg(test)]