Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #62080

Closed
wants to merge 23 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6203f68
compiletest: Introduce `// {check,build,run}-pass` pass modes
petrochenkov Jun 12, 2019
8e8fba1
compiletest: Validate pass modes harder
petrochenkov Jun 12, 2019
932ea64
compiletest: Remove `skip-codegen`
petrochenkov Jun 12, 2019
0886bc4
compiletest: Move pass mode update into a separate function
petrochenkov Jun 16, 2019
fb0b43c
submodules: Update clippy from 5a11ed7b to c5d1ecd4
tesuji Jun 22, 2019
4d53714
Remove redundant syntax::ast::Guard.
Centril Jun 23, 2019
0aeab41
Run rustfmt
ia0 May 29, 2019
2b6371d
Make tidy quieter by default
Mark-Simulacrum Jun 21, 2019
5f1da8e
Cache Regex's
Mark-Simulacrum Jun 21, 2019
e17b02d
Use walkdir crate
Mark-Simulacrum Jun 21, 2019
5c33c3e
Stop calling format! to check feature gate
Mark-Simulacrum Jun 21, 2019
c113a37
Pass contents and DirEntry to walkers
Mark-Simulacrum Jun 21, 2019
38f0b90
Move file-reading into walker loop
Mark-Simulacrum Jun 21, 2019
d619e44
Utilize entry.metadata over fs::symlink_metadata
Mark-Simulacrum Jun 21, 2019
7dd7c0f
Skip querying each ignore directive if none in file
Mark-Simulacrum Jun 21, 2019
ebbc662
Use Path/PathBuf directly instead of through path::
Mark-Simulacrum Jun 21, 2019
6c5c78d
Collect features only once
Mark-Simulacrum Jun 21, 2019
777951c
Exit early from feature search if no features in file
Mark-Simulacrum Jun 21, 2019
6e06fa0
Rollup merge of #61778 - petrochenkov:pass, r=Mark-Simulacrum
Centril Jun 23, 2019
3d4f15e
Rollup merge of #62037 - Mark-Simulacrum:tidy-fast, r=eddyb
Centril Jun 23, 2019
f8e1e5c
Rollup merge of #62052 - lzutao:clippy-update, r=oli-obk
Centril Jun 23, 2019
b816015
Rollup merge of #62070 - ia0:rustfmt, r=petrochenkov
Centril Jun 23, 2019
a8b4d1d
Rollup merge of #62075 - Centril:guardless-match-arms, r=petrochenkov
Centril Jun 23, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make tidy quieter by default
  • Loading branch information
Mark-Simulacrum committed Jun 23, 2019
commit 2b6371dbfbf390a57b68e670a416f8a0b3094b07
4 changes: 2 additions & 2 deletions src/bootstrap/test.rs
Original file line number Diff line number Diff line change
@@ -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");
22 changes: 11 additions & 11 deletions src/tools/tidy/src/features.rs
Original file line number Diff line number Diff line change
@@ -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());
}
}

4 changes: 2 additions & 2 deletions src/tools/tidy/src/main.rs
Original file line number Diff line number Diff line change
@@ -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);