From: Hidehito Yabuuchi <hdht.ybuc@gmail.com>
Date: Thu, 10 May 2018 02:52:44 +0000 (+0900)
Subject: Does not print seconds fraction with minutes
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2^2~44^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=37a8cd86fa27082826c2a399672cc8bf4c622325;p=cargo.git

Does not print seconds fraction with minutes
---

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() {