Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions src/cargo/core/compiler/job_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -276,26 +276,14 @@ impl<'a> JobQueue<'a> {
}

let time_elapsed = {
use std::fmt::Write;

let duration = cx.bcx.config.creation_time().elapsed();
let mut s = String::new();
let secs = duration.as_secs();

if secs >= 60 {
// We can safely unwrap, as writing to a `String` never errors
write!(s, "{}m ", secs / 60).unwrap();
};

// We can safely unwrap, as writing to a `String` never errors
write!(
s,
"{}.{:02}s",
secs % 60,
duration.subsec_nanos() / 10_000_000
).unwrap();

s
format!("{}m {:02}s", secs / 60, secs % 60)
} else {
format!("{}.{:02}s", secs, duration.subsec_nanos() / 10_000_000)
}
};

if self.queue.is_empty() {
Expand Down