From 37a8cd86fa27082826c2a399672cc8bf4c622325 Mon Sep 17 00:00:00 2001 From: Hidehito Yabuuchi Date: Thu, 10 May 2018 11:52:44 +0900 Subject: [PATCH] Does not print seconds fraction with minutes --- src/cargo/core/compiler/job_queue.rs | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs index 235dccc93..0662987d2 100644 --- a/src/cargo/core/compiler/job_queue.rs +++ b/src/cargo/core/compiler/job_queue.rs @@ -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 % 60, duration.subsec_nanos() / 10_000_000) + } }; if self.queue.is_empty() { -- 2.30.2