From d78559ac1192553c3bda717a00f2887943144719 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Sat, 16 Oct 2021 13:30:24 +0100 Subject: [PATCH] bootstrap: tweak verbosity settings Currently the verbosity settings are: - 2: RUSTC-SHIM envvars get spammed on every invocation, O(30) lines cargo is passed -v which outputs CLI invocations, O(5) lines - 3: cargo is passed -vv which outputs build script output, O(0-10) lines This commit changes it to: - 1: cargo is passed -v, O(5) lines - 2: cargo is passed -vv, O(10) lines - 3: RUSTC-SHIM envvars get spammed, O(30) lines --- src/bootstrap/bin/rustc.rs | 2 +- src/bootstrap/bootstrap.py | 2 +- src/bootstrap/builder.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs index ac8bbfe102dfe..ed53a98e9a53f 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs @@ -146,7 +146,7 @@ fn main() { } let is_test = args.iter().any(|a| a == "--test"); - if verbose > 1 { + if verbose > 2 { let rust_env_vars = env::vars().filter(|(k, _)| k.starts_with("RUST") || k.starts_with("CARGO")); let prefix = if is_test { "[RUSTC-SHIM] rustc --test" } else { "[RUSTC-SHIM] rustc" }; diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 0170be967e1e3..532853cba0dd0 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -959,7 +959,7 @@ def build_bootstrap(self): self.cargo())) args = [self.cargo(), "build", "--manifest-path", os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] - for _ in range(1, self.verbose): + for _ in range(0, self.verbose): args.append("--verbose") if self.use_locked_deps: args.append("--locked") diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 6750f7a549dd6..ac1841b691334 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1483,7 +1483,7 @@ impl<'a> Builder<'a> { cargo.env("WINAPI_NO_BUNDLED_LIBRARIES", "1"); } - for _ in 1..self.verbosity { + for _ in 0..self.verbosity { cargo.arg("-v"); }