Skip to content

Commit

Permalink
x.py clippy: don't run with --all-targets by default
Browse files Browse the repository at this point in the history
this caused a lot of noise because benchmarks and tests were also checked
  • Loading branch information
matthiaskrgr committed Aug 31, 2021
1 parent 0a84708 commit 5538be5
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions src/bootstrap/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ impl Step for Std {
add_to_sysroot(&builder, &libdir, &hostdir, &libstd_stamp(builder, compiler, target));
}

// don't run on std twice with x.py clippy
if builder.kind == Kind::Clippy {
return;
}

// Then run cargo again, once we've put the rmeta files for the library
// crates into the sysroot. This is needed because e.g., core's tests
// depend on `libtest` -- Cargo presumes it will exist, but it doesn't
Expand All @@ -120,6 +125,7 @@ impl Step for Std {
target,
cargo_subcommand(builder.kind),
);

cargo.arg("--all-targets");
std_cargo(builder, target, compiler.stage, &mut cargo);

Expand Down Expand Up @@ -192,7 +198,12 @@ impl Step for Rustc {
cargo_subcommand(builder.kind),
);
rustc_cargo(builder, &mut cargo, target);
cargo.arg("--all-targets");

// For ./x.py clippy, don't run with --all-targets because
// linting tests and benchmarks can produce very noisy results
if builder.kind != Kind::Clippy {
cargo.arg("--all-targets");
}

// Explicitly pass -p for all compiler krates -- this will force cargo
// to also check the tests/benches/examples for these crates, rather
Expand Down Expand Up @@ -313,7 +324,12 @@ macro_rules! tool_check_step {
$source_type,
&[],
);
cargo.arg("--all-targets");

// For ./x.py clippy, don't run with --all-targets because
// linting tests and benchmarks can produce very noisy results
if builder.kind != Kind::Clippy {
cargo.arg("--all-targets");
}

// Enable internal lints for clippy and rustdoc
// NOTE: this doesn't enable lints for any other tools unless they explicitly add `#![warn(rustc::internal)]`
Expand Down

0 comments on commit 5538be5

Please sign in to comment.