Merge pull request #536 from Nukesor/replace-chrono-english

fix: Replace chrono-english with interim as drop-in
Nukesor · May 31, 2024 · 594c53e · 594c53e
2 parents bd977b7 + 663dcef
commit 594c53e
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ rust-version = "1.67"
 [workspace.dependencies]
 # Chrono version is hard pinned to a specific version.
 # See https://github.com/Nukesor/pueue/issues/534
-chrono = { version = "=0.4.35", features = ["serde"] }
+chrono = { version = "0.4", features = ["serde"] }
 command-group = "5"
 log = "0.4"
 serde = "1.0"

diff --git a/pueue/Cargo.toml b/pueue/Cargo.toml
@@ -17,14 +17,14 @@ maintenance = { status = "actively-developed" }
 [dependencies]
 anyhow = "1.0"
 chrono = { workspace = true }
-chrono-english = "0.1"
 clap = { version = "4.5.1", features = ["derive", "cargo", "help"] }
 clap_complete = "4.5.1"
 clap_complete_nushell = "4.5.1"
 comfy-table = "7"
 command-group = { workspace = true }
 ctrlc = { version = "3", features = ["termination"] }
 handlebars = { workspace = true }
+interim = { version = "0.1.2", features = ["chrono"] }
 log = { workspace = true }
 pest = "2.7"
 pest_derive = "2.7"

diff --git a/pueue/src/client/cli.rs b/pueue/src/client/cli.rs
@@ -2,9 +2,9 @@ use std::path::PathBuf;
 
 use chrono::prelude::*;
 use chrono::TimeDelta;
-use chrono_english::*;
 use clap::ArgAction;
 use clap::{Parser, ValueEnum, ValueHint};
+use interim::*;
 
 use pueue_lib::network::message::Signal;