File tree Expand file tree Collapse file tree 4 files changed +17
-2
lines changed Expand file tree Collapse file tree 4 files changed +17
-2
lines changed Original file line number Diff line number Diff line change 467467# Whether to use the precompiled stage0 libtest with compiletest.
468468# build.compiletest-use-stage0-libtest = true
469469
470+ # Default value for the `--extra-checks` flag of tidy.
471+ #
472+ # See `./x test tidy --help` for details.
473+ #
474+ # Note that if any value is manually given to bootstrap such as
475+ # `./x test tidy --extra-checks=js`, this value is ignored.
476+ # Use `--extra-checks=''` to temporarily disable all extra checks.
477+ # build.tidy-extra-checks = ""
478+
470479# Indicates whether ccache is used when building certain artifacts (e.g. LLVM).
471480# Set to `true` to use the first `ccache` in PATH, or set an absolute path to use
472481# a specific version.
Original file line number Diff line number Diff line change @@ -1107,7 +1107,9 @@ impl Step for Tidy {
11071107 if builder. config . cmd . bless ( ) {
11081108 cmd. arg ( "--bless" ) ;
11091109 }
1110- if let Some ( s) = builder. config . cmd . extra_checks ( ) {
1110+ if let Some ( s) =
1111+ builder. config . cmd . extra_checks ( ) . or ( builder. config . tidy_extra_checks . as_deref ( ) )
1112+ {
11111113 cmd. arg ( format ! ( "--extra-checks={s}" ) ) ;
11121114 }
11131115 let mut args = std:: env:: args_os ( ) ;
Original file line number Diff line number Diff line change @@ -298,7 +298,8 @@ pub struct Config {
298298
299299 /// Whether to use the precompiled stage0 libtest with compiletest.
300300 pub compiletest_use_stage0_libtest : bool ,
301-
301+ /// Default value for `--extra-checks`
302+ pub tidy_extra_checks : Option < String > ,
302303 pub is_running_on_ci : bool ,
303304
304305 /// Cache for determining path modifications
@@ -745,6 +746,7 @@ impl Config {
745746 jobs,
746747 compiletest_diff_tool,
747748 compiletest_use_stage0_libtest,
749+ tidy_extra_checks,
748750 mut ccache,
749751 exclude,
750752 } = toml. build . unwrap_or_default ( ) ;
@@ -1013,6 +1015,7 @@ impl Config {
10131015 optimized_compiler_builtins. unwrap_or ( config. channel != "dev" ) ;
10141016 config. compiletest_diff_tool = compiletest_diff_tool;
10151017 config. compiletest_use_stage0_libtest = compiletest_use_stage0_libtest. unwrap_or ( true ) ;
1018+ config. tidy_extra_checks = tidy_extra_checks;
10161019
10171020 let download_rustc = config. download_rustc_commit . is_some ( ) ;
10181021 config. explicit_stage_from_cli = flags_stage. is_some ( ) ;
Original file line number Diff line number Diff line change @@ -69,6 +69,7 @@ define_config! {
6969 jobs: Option <u32 > = "jobs" ,
7070 compiletest_diff_tool: Option <String > = "compiletest-diff-tool" ,
7171 compiletest_use_stage0_libtest: Option <bool > = "compiletest-use-stage0-libtest" ,
72+ tidy_extra_checks: Option <String > = "tidy-extra-checks" ,
7273 ccache: Option <StringOrBool > = "ccache" ,
7374 exclude: Option <Vec <PathBuf >> = "exclude" ,
7475 }
You can’t perform that action at this time.
0 commit comments