Replace humantime dependency for jiff

Author: killzoner

Cargo.lock

@@ -55,8 +55,7 @@ rayon = "1.5.1"
 
 serde = { version = "1.0", features = ["derive"] }
 shlex = "1.1.0"
-humantime = "2"
-humantime-serde = "1"
+jiff = { version = "0.2.4", default-features = false }
 toml_edit = { version = "0.22.13", features = ["serde"] }
 escargot = { version = "0.5.13", optional = true }
 

crates/trycmd/Cargo.toml

@@ -11,6 +11,7 @@ use std::eprintln;
 #[cfg(not(feature = "color"))]
 use std::io::stderr;
 
+use jiff::SignedDuration;
 use rayon::prelude::*;
 use snapbox::data::DataFormat;
 use snapbox::dir::FileType;
@@ -68,10 +69,11 @@ impl Runner {
                                         status.spawn.status.summary(),
                                     );
                                     if let Some(duration) = status.duration {
+                                        let duration = SignedDuration::try_from(duration).unwrap();
                                         let _ = write!(
                                             stderr,
                                             " {}",
-                                            palette.hint(humantime::format_duration(duration)),
+                                            palette.hint(format!("{duration:#}")),
                                         );
                                     }
                                     let _ = writeln!(stderr);
@@ -90,10 +92,11 @@ impl Runner {
                                         palette.error("failed"),
                                     );
                                     if let Some(duration) = status.duration {
+                                        let duration = SignedDuration::try_from(duration).unwrap();
                                         let _ = write!(
                                             stderr,
                                             " {}",
-                                            palette.hint(humantime::format_duration(duration)),
+                                            palette.hint(format!("{duration:#}")),
                                         );
                                     }
                                     let _ = writeln!(stderr);

crates/trycmd/src/runner.rs

@@ -645,12 +645,23 @@ pub struct OneShot {
     #[serde(default)]
     pub(crate) binary: bool,
     #[serde(default)]
-    #[serde(deserialize_with = "humantime_serde::deserialize")]
+    #[serde(deserialize_with = "deserialize_jiff_duration")]
     pub(crate) timeout: Option<std::time::Duration>,
     #[serde(default)]
     pub(crate) fs: Filesystem,
 }
 
+fn deserialize_jiff_duration<'de, D>(deserializer: D) -> Result<Option<std::time::Duration>, D::Error>
+where D: serde::Deserializer<'de> {
+    use serde::de::Deserialize;
+
+    let buf = String::deserialize(deserializer)?;
+
+    buf
+        .parse::<jiff::SignedDuration>()
+        .map(|e| Some(e.unsigned_abs())).map_err(serde::de::Error::custom)
+}
+
 impl OneShot {
     fn parse_toml(s: &str) -> Result<Self, crate::Error> {
         toml_edit::de::from_str(s).map_err(|e| e.to_string().into())