From a071c3ab9bf3d18f5c5b7a0c96fe670987680f9b Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 10 May 2018 12:07:02 -0700
Subject: [PATCH] Fixup some minor review comments

---
 src/cargo/core/compiler/build_plan.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/cargo/core/compiler/build_plan.rs b/src/cargo/core/compiler/build_plan.rs
index 788d569b8..d0ac68eed 100644
--- a/src/cargo/core/compiler/build_plan.rs
+++ b/src/cargo/core/compiler/build_plan.rs
@@ -73,19 +73,20 @@ impl Invocation {
         self.program = cmd.get_program()
             .to_str()
             .ok_or_else(|| format_err!("unicode program string required"))?
-            .to_string()
-            .clone();
+            .to_string();
         self.cwd = Some(cmd.get_cwd().unwrap().to_path_buf());
         for arg in cmd.get_args().iter() {
             self.args.push(
                 arg.to_str()
                     .ok_or_else(|| format_err!("unicode argument string required"))?
-                    .to_string()
-                    .clone(),
+                    .to_string(),
             );
         }
-        for var in cmd.get_envs().keys() {
-            let value = cmd.get_env(var).unwrap_or_default();
+        for (var, value) in cmd.get_envs() {
+            let value = match value {
+                Some(s) => s,
+                None => continue,
+            };
             self.env.insert(
                 var.clone(),
                 value
-- 
2.30.2