render: switch from humantime to jiff

Since prodash switched over to Jiff, Jiff has grown support for the
"friendly" duration format. It is meant to be a replacement for
`humantime` formatting of durations.

Author: BurntSushi

Cargo.toml

@@ -39,7 +39,7 @@ progress-tree-log = ["log"]
 progress-log = ["log"]
 unit-bytes = ["bytesize"]
 unit-human = ["human_format"]
-unit-duration = ["humantime"]
+unit-duration = ["jiff"]
 render-tui-crossterm = ["crosstermion/tui-react-crossterm", "crosstermion/input-async-crossterm"]
 render-tui = ["tui",
     "unicode-segmentation",
@@ -49,8 +49,8 @@ render-tui = ["tui",
     "futures-lite",
     "futures-core",
     "async-io",
-    "humantime"]
-render-line = ["crosstermion/color", "humantime", "unicode-width"]
+    "jiff"]
+render-line = ["crosstermion/color", "jiff", "unicode-width"]
 render-line-crossterm = ["crosstermion/crossterm"]
 render-line-autoconfigure = ["is-terminal"]
 
@@ -69,7 +69,6 @@ tui = { package = "ratatui", version = "0.26.0", optional = true, default-featur
 tui-react = { version = "0.23.0", optional = true }
 futures-core = { version = "0.3.4", optional = true, default-features = false }
 futures-lite = { version = "2.1.0", optional = true }
-humantime = { version = "2.1.0", optional = true }
 unicode-segmentation = { version = "1.6.0", optional = true }
 unicode-width = { version = "0.1.7", optional = true }
 crosstermion = { version = "0.14.0", optional = true, default-features = false }

README.md

@@ -71,7 +71,7 @@ This crate comes with various cargo features to tailor it to your needs.
 * **unit-human**
   * Display counts in a way that is easier to grasp for humans, using the tiny `human_format` crate.
 * **unit-duration**
-  * Displays time in seconds like '_5m4s_' using the tiny `humantime` crate.
+  * Displays time in seconds like '_5m4s_' using the `jiff` crate's friendly duration format.
 
 ## Features
 

src/lib.rs

@@ -46,7 +46,7 @@ pub use log::info;
 #[cfg(feature = "progress-tree-log")]
 pub use log::warn;
 
-#[cfg(any(feature = "humantime", feature = "local-time"))]
+#[cfg(any(feature = "jiff", feature = "local-time"))]
 ///
 pub mod time;
 

src/render/tui/draw/progress.rs

@@ -1,10 +1,5 @@
-use std::{
-    fmt,
-    sync::atomic::Ordering,
-    time::{Duration, SystemTime},
-};
+use std::{fmt, sync::atomic::Ordering, time::Duration};
 
-use humantime::format_duration;
 use tui::{
     buffer::Buffer,
     layout::Rect,
@@ -300,13 +295,14 @@ fn add_block_eta(state: progress::State, progress_text: &mut String) {
             progress_text.push_str(reason);
             progress_text.push(']');
             if let Some(eta) = maybe_eta {
-                let now = SystemTime::now();
+                let eta = jiff::Timestamp::try_from(eta).expect("reasonable system time");
+                let now = jiff::Timestamp::now();
                 if eta > now {
                     use std::fmt::Write;
                     write!(
                         progress_text,
-                        " → {} to {}",
-                        format_duration(eta.duration_since(now).expect("computation to work")),
+                        " → {:#} to {}",
+                        eta.duration_since(now),
                         if let progress::State::Blocked(_, _) = state {
                             "unblock"
                         } else {

src/time.rs

@@ -36,23 +36,16 @@ mod utc {
     ///
     /// Available without the `localtime` feature toggle.
     pub fn format_time_for_messages(time: SystemTime) -> String {
-        String::from_utf8_lossy(
-            &humantime::format_rfc3339_seconds(time).to_string().as_bytes()
-                [DATE_TIME_YMD..DATE_TIME_YMD + DATE_TIME_HMS],
-        )
-        .into_owned()
+        let time = jiff::Timestamp::try_from(time).expect("reasonable system time");
+        time.strftime("%T").to_string()
     }
 
     /// Return a string representing the current time as UTC.
     ///
     /// Available without the `localtime` feature toggle.
     pub fn format_now_datetime_seconds() -> String {
-        String::from_utf8_lossy(
-            &humantime::format_rfc3339_seconds(std::time::SystemTime::now())
-                .to_string()
-                .as_bytes()[.."2020-02-13T00:51:45".len()],
-        )
-        .into_owned()
+        let time = jiff::Timestamp::try_from(time).expect("reasonable system time");
+        time.strftime("%FT%T").to_string()
     }
 }
 

src/unit/duration.rs

@@ -1,6 +1,4 @@
-use std::{fmt, time};
-
-use humantime::format_duration;
+use std::fmt;
 
 use crate::{progress::Step, unit::DisplayValue};
 
@@ -10,13 +8,15 @@ pub struct Duration;
 
 impl DisplayValue for Duration {
     fn display_current_value(&self, w: &mut dyn fmt::Write, value: Step, _upper: Option<Step>) -> fmt::Result {
-        w.write_str(&format_duration(time::Duration::new(value as u64, 0)).to_string())
+        let dur = jiff::SignedDuration::from_secs(value as i64);
+        w.write_str(&format!("{dur:#}"))
     }
     fn separator(&self, w: &mut dyn fmt::Write, _value: Step, _upper: Option<Step>) -> fmt::Result {
         w.write_str(" of ")
     }
     fn display_upper_bound(&self, w: &mut dyn fmt::Write, upper_bound: Step, _value: Step) -> fmt::Result {
-        w.write_str(&format_duration(time::Duration::new(upper_bound as u64, 0)).to_string())
+        let dur = jiff::SignedDuration::from_secs(upper_bound as i64);
+        w.write_str(&format!("{dur:#}"))
     }
 
     fn dyn_hash(&self, state: &mut dyn std::hash::Hasher) {