log progress now works with units

Byron · Aug 10, 2020 · 37f1266 · 37f1266
1 parent 006ba9d
commit 37f1266
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/progress/log.rs b/src/progress/log.rs
@@ -64,9 +64,8 @@ impl Progress for Log {
             > EMIT_LOG_EVERY_S
         {
             self.last_set = Some(now);
-            match (self.max, self.unit) {
-                (Some(max), Some(unit)) => log::info!("{} → {} / {} {}", self.name, step, max, unit),
-                (None, Some(unit)) => log::info!("{} → {} {}", self.name, step, unit),
+            match (self.max, &self.unit) {
+                (max, Some(unit)) => log::info!("{} → {}", self.name, unit.display(step, max, None)),
                 (Some(max), None) => log::info!("{} → {} / {}", self.name, step, max),
                 (None, None) => log::info!("{} → {}", self.name, step),
             }

diff --git a/src/unit/mod.rs b/src/unit/mod.rs
@@ -83,12 +83,12 @@ impl Unit {
         &self,
         current_value: Step,
         upper_bound: Option<Step>,
-        elapsed: impl Into<Option<display::Throughput>>,
+        throughput: impl Into<Option<display::Throughput>>,
     ) -> display::UnitDisplay {
         display::UnitDisplay {
             current_value,
             upper_bound,
-            throughput: elapsed.into(),
+            throughput: throughput.into(),
             parent: self,
             display: display::What::ValuesAndUnit,
         }