Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Does not print seconds fraction with minutes #5507

Merged
merged 2 commits into from
May 10, 2018
Merged

Does not print seconds fraction with minutes #5507

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37a8cd8
Does not print seconds fraction with minutes
ordovicia May 10, 2018
73941b0
Remove unnecessary computation in printing elapsed time
ordovicia May 10, 2018
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
View file
Open in desktop
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