Skip to content

Commit 17a7778

Browse files
committed
Improve formatting of longer download times in download tracker
1 parent 22b6cdb commit 17a7778

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

src/rustup-cli/download_tracker.rs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,25 @@ impl fmt::Display for HumanReadable {
176176

177177
if sec.is_infinite() {
178178
write!(f, "Unknown")
179-
} else if sec > 1e3 {
179+
} else if sec > 48. * 3600. {
180180
let sec = self.0 as u64;
181-
let min = sec / 60;
182-
let sec = sec % 60;
181+
let d = sec / (24. * 3600.);
182+
let h = sec % (24. * 3600.);
183+
let min = sec % 3600.;
184+
let sec = sec % 60.;
185+
186+
write!(f, "{:3} days {:2} h {:2} min {:2} s", d, h, min, sec) // XYZ days PQ h RS min TU s
187+
} else if sec > 6_000. {
188+
let sec = self.0 as u64;
189+
let h = sec / 3600.;
190+
let min = sec % 3600.;
191+
let sec = sec % 60.;
192+
193+
write!(f, "{:3} h {:2} min {:2} s", h, min, sec) // XYZ h PQ min RS s
194+
} else if sec > 100 {
195+
let sec = self.0 as u64;
196+
let min = sec / 60.;
197+
let sec = sec % 60.;
183198

184199
write!(f, "{:3} min {:2} s", min, sec) // XYZ min PQ s
185200
} else {

0 commit comments

Comments
 (0)