Skip to content

Commit 1a88af0

Browse files
committed
Treat time in seconds as an integer for download times
fixes #1696
1 parent 5bdc803 commit 1a88af0

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

src/rustup-cli/download_tracker.rs

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -172,29 +172,26 @@ impl fmt::Display for HumanReadable {
172172
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
173173
if f.alternate() {
174174
// repurposing the alternate mode for ETA
175-
let sec = self.0;
175+
let sec = self.0 as u32;
176176

177177
if sec.is_infinite() {
178178
write!(f, "Unknown")
179-
} else if sec > 48. * 3600. {
180-
let sec = self.0;
181-
let d = sec / (24. * 3600.);
182-
let h = sec % (24. * 3600.);
183-
let min = sec % 3600.;
184-
let sec = sec % 60.;
179+
} else if sec > 48 * 3600 {
180+
let d = sec / (24 * 3600);
181+
let h = sec % (24 * 3600);
182+
let min = sec % 3600;
183+
let sec = sec % 60;
185184

186185
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;
189-
let h = sec / 3600.;
190-
let min = sec % 3600.;
191-
let sec = sec % 60.;
186+
} else if sec > 6_000 {
187+
let h = sec / 3600;
188+
let min = sec % 3600;
189+
let sec = sec % 60;
192190

193191
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;
196-
let min = sec / 60.;
197-
let sec = sec % 60.;
192+
} else if sec > 100 {
193+
let min = sec / 60;
194+
let sec = sec % 60;
198195

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

0 commit comments

Comments
 (0)