Remove verbosity from Build

rust-lang · Mark-Simulacrum · Feb 11, 2018 · Feb 11, 2018 · Feb 11, 2018 · Feb 11, 2018
commit 9a695be42d5da0811fef5ba913da96a7a8469975
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -663,7 +663,7 @@ impl<'a> Builder<'a> {
             cargo.env("RUSTC_ON_FAIL", on_fail);
         }
 
-        cargo.env("RUSTC_VERBOSE", format!("{}", self.verbosity));
+        cargo.env("RUSTC_VERBOSE", format!("{}", self.config.verbose));
 
         // Throughout the build Cargo can execute a number of build scripts
         // compiling C/C++ code and we need to pass compilers, archivers, flags, etc

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
@@ -224,7 +224,6 @@ pub struct Build {
     rustfmt_info: channel::GitInfo,
     fail_fast: bool,
     doc_tests: bool,
    verbosity: usize,
 
     // Probed tools at runtime
     lldb_version: Option<String>,
@@ -295,7 +294,6 @@ impl Build {
         Build {
             fail_fast: config.cmd.fail_fast(),
             doc_tests: config.cmd.doc_tests(),
-            verbosity: config.verbose,
 
             config,
 
@@ -562,11 +560,11 @@ impl Build {
     }
 
     pub fn is_verbose(&self) -> bool {
-        self.verbosity > 0
+        self.config.verbose > 0
     }
 
     pub fn is_very_verbose(&self) -> bool {
-        self.verbosity > 1
+        self.config.verbose > 1
     }
 
     /// Prints a message if this build is configured in verbose mode.