Skip to content

Commit af08be9

Browse files
committed
Auto merge of #5507 - ordovicia:no-secs-frac, r=matklad
Does not print seconds fraction with minutes As discussed in #5456 (comment), seconds fraction seems unnecessary when the elapsed time is reported in minutes.
2 parents caa7ac1 + 73941b0 commit af08be9

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

src/cargo/core/compiler/job_queue.rs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -276,26 +276,14 @@ impl<'a> JobQueue<'a> {
276276
}
277277

278278
let time_elapsed = {
279-
use std::fmt::Write;
280-
281279
let duration = cx.bcx.config.creation_time().elapsed();
282-
let mut s = String::new();
283280
let secs = duration.as_secs();
284281

285282
if secs >= 60 {
286-
// We can safely unwrap, as writing to a `String` never errors
287-
write!(s, "{}m ", secs / 60).unwrap();
288-
};
289-
290-
// We can safely unwrap, as writing to a `String` never errors
291-
write!(
292-
s,
293-
"{}.{:02}s",
294-
secs % 60,
295-
duration.subsec_nanos() / 10_000_000
296-
).unwrap();
297-
298-
s
283+
format!("{}m {:02}s", secs / 60, secs % 60)
284+
} else {
285+
format!("{}.{:02}s", secs, duration.subsec_nanos() / 10_000_000)
286+
}
299287
};
300288

301289
if self.queue.is_empty() {

0 commit comments

Comments
 (0)