From 9b34ef643f82f14b7c94041af4b34788801c9983 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 10 Sep 2019 09:10:24 -0700
Subject: [PATCH] Stylistic changes

---
 src/bootstrap/builder.rs | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 428926e106b..9046eded381 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -1079,12 +1079,9 @@ pub fn cargo(
             }
         }
 
-        match mode {
-            Mode::Rustc | Mode::Codegen => {
-                rustflags.arg("-Zunstable-options");
-                rustflags.arg("-Wrustc::internal");
-            }
-            _ => {}
+        if let Mode::Rustc | Mode::Codegen = mode {
+            rustflags.arg("-Zunstable-options");
+            rustflags.arg("-Wrustc::internal");
         }
 
         // Throughout the build Cargo can execute a number of build scripts
@@ -1230,11 +1227,8 @@ pub fn cargo(
         // When we build Rust dylibs they're all intended for intermediate
         // usage, so make sure we pass the -Cprefer-dynamic flag instead of
         // linking all deps statically into the dylib.
-        match mode {
-            Mode::Std | Mode::Rustc | Mode::Codegen => {
-                rustflags.arg("-Cprefer-dynamic");
-            }
-            _ => {}
+        if let Mode::Std | Mode::Rustc | Mode::Codegen = mode {
+            rustflags.arg("-Cprefer-dynamic");
         }
 
         Cargo {
@@ -1348,7 +1342,7 @@ impl Rustflags {
     fn new(target: &str, cmd: &mut Command) -> Rustflags {
         let mut ret = Rustflags(String::new());
 
-        // Inherit `RUSTFLAGS` by default
+        // Inherit `RUSTFLAGS` by default ...
         ret.env("RUSTFLAGS");
 
         // ... and also handle target-specific env RUSTFLAGS if they're
@@ -1358,7 +1352,7 @@ fn new(target: &str, cmd: &mut Command) -> Rustflags {
         ret.env(&target_specific);
         cmd.env_remove(&target_specific);
 
-        return ret;
+        ret
     }
 
     fn env(&mut self, env: &str) {