Skip to content

set default for build.tidy-extra-checks to auto run all but shellcheck #144461

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/bootstrap/src/core/build_steps/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1125,10 +1125,10 @@ impl Step for Tidy {
if builder.config.cmd.bless() {
cmd.arg("--bless");
}
if let Some(s) =
builder.config.cmd.extra_checks().or(builder.config.tidy_extra_checks.as_deref())
{
cmd.arg(format!("--extra-checks={s}"));
let extra_checks =
builder.config.cmd.extra_checks().unwrap_or(builder.config.tidy_extra_checks.as_str());
if !extra_checks.is_empty() {
cmd.arg(format!("--extra-checks={extra_checks}"));
}
let mut args = std::env::args_os();
if args.any(|arg| arg == OsStr::new("--")) {
Expand Down
5 changes: 3 additions & 2 deletions src/bootstrap/src/core/config/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ pub struct Config {
/// Whether to use the precompiled stage0 libtest with compiletest.
pub compiletest_use_stage0_libtest: bool,
/// Default value for `--extra-checks`
pub tidy_extra_checks: Option<String>,
pub tidy_extra_checks: String,
pub is_running_on_ci: bool,

/// Cache for determining path modifications
Expand Down Expand Up @@ -1014,7 +1014,8 @@ impl Config {
optimized_compiler_builtins.unwrap_or(config.channel != "dev");
config.compiletest_diff_tool = compiletest_diff_tool;
config.compiletest_use_stage0_libtest = compiletest_use_stage0_libtest.unwrap_or(true);
config.tidy_extra_checks = tidy_extra_checks;
config.tidy_extra_checks = tidy_extra_checks
.unwrap_or_else(|| "auto:js,auto:cpp,auto:py,auto:spellcheck".to_string());

let download_rustc = config.download_rustc_commit.is_some();
config.explicit_stage_from_cli = flags_stage.is_some();
Expand Down
Loading