Auto merge of #6369 - matthiaskrgr:1_crates, r=dwijnand

progress: display "Downloading 1 crate" instead of "Downloading 1 crates"
rust-lang · Dec 2, 2018 · bfdbf10 · bfdbf10
2 parents de1ef75 + ebced4a
commit bfdbf10
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs
@@ -816,7 +816,12 @@ impl<'a, 'cfg> Downloads<'a, 'cfg> {
                 return Ok(());
             }
         }
-        let mut msg = format!("{} crates", self.pending.len());
+        let pending = self.pending.len();
+        let mut msg = if pending == 1 {
+            format!("{} crate", pending)
+        } else {
+            format!("{} crates", pending)
+        };
         match why {
             WhyTick::Extracting(krate) => {
                 msg.push_str(&format!(", extracting {} ...", krate));