diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-06-21 11:04:30 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-06-23 09:09:44 -0400 |
| commit | 2b6371dbfbf390a57b68e670a416f8a0b3094b07 (patch) | |
| tree | 75668877d9b9b3c86491ea5fcf95cf84a8b58713 | |
| parent | a96ba969156d257e5d5b692946fa8fe40ed6543a (diff) | |
| download | rust-2b6371dbfbf390a57b68e670a416f8a0b3094b07.tar.gz rust-2b6371dbfbf390a57b68e670a416f8a0b3094b07.zip | |
Make tidy quieter by default
| -rw-r--r-- | src/bootstrap/test.rs | 4 | ||||
| -rw-r--r-- | src/tools/tidy/src/features.rs | 22 | ||||
| -rw-r--r-- | src/tools/tidy/src/main.rs | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 74caaae2840..2f9bd067c31 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -709,8 +709,8 @@ impl Step for Tidy { if !builder.config.vendor { cmd.arg("--no-vendor"); } - if !builder.config.verbose_tests { - cmd.arg("--quiet"); + if builder.is_verbose() { + cmd.arg("--verbose"); } let _folder = builder.fold_output(|| "tidy"); diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs index 637f10c5ae7..6aa093c1ef0 100644 --- a/src/tools/tidy/src/features.rs +++ b/src/tools/tidy/src/features.rs @@ -51,7 +51,7 @@ pub struct Feature { pub type Features = HashMap<String, Feature>; -pub fn check(path: &Path, bad: &mut bool, quiet: bool) { +pub fn check(path: &Path, bad: &mut bool, verbose: bool) { let mut features = collect_lang_features(path, bad); assert!(!features.is_empty()); @@ -132,18 +132,18 @@ pub fn check(path: &Path, bad: &mut bool, quiet: bool) { if *bad { return; } - if quiet { - println!("* {} features", features.len()); - return; - } - let mut lines = Vec::new(); - lines.extend(format_features(&features, "lang")); - lines.extend(format_features(&lib_features, "lib")); + if verbose { + let mut lines = Vec::new(); + lines.extend(format_features(&features, "lang")); + lines.extend(format_features(&lib_features, "lib")); - lines.sort(); - for line in lines { - println!("* {}", line); + lines.sort(); + for line in lines { + println!("* {}", line); + } + } else { + println!("* {} features", features.len()); } } diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs index eef37190438..fa88b078cd8 100644 --- a/src/tools/tidy/src/main.rs +++ b/src/tools/tidy/src/main.rs @@ -19,12 +19,12 @@ fn main() { let args: Vec<String> = env::args().skip(1).collect(); let mut bad = false; - let quiet = args.iter().any(|s| *s == "--quiet"); + let verbose = args.iter().any(|s| *s == "--verbose"); bins::check(&path, &mut bad); style::check(&path, &mut bad); errors::check(&path, &mut bad); cargo::check(&path, &mut bad); - features::check(&path, &mut bad, quiet); + features::check(&path, &mut bad, verbose); pal::check(&path, &mut bad); unstable_book::check(&path, &mut bad); libcoretest::check(&path, &mut bad); |
