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 467
467
# Whether to use the precompiled stage0 libtest with compiletest.
468
468
# build.compiletest-use-stage0-libtest = true
469
469
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
+
470
479
# Indicates whether ccache is used when building certain artifacts (e.g. LLVM).
471
480
# Set to `true` to use the first `ccache` in PATH, or set an absolute path to use
472
481
# a specific version.
Original file line number Diff line number Diff line change @@ -1108,7 +1108,9 @@ impl Step for Tidy {
1108
1108
if builder. config . cmd . bless ( ) {
1109
1109
cmd. arg ( "--bless" ) ;
1110
1110
}
1111
- if let Some ( s) = builder. config . cmd . extra_checks ( ) {
1111
+ if let Some ( s) =
1112
+ builder. config . cmd . extra_checks ( ) . or ( builder. config . tidy_extra_checks . as_deref ( ) )
1113
+ {
1112
1114
cmd. arg ( format ! ( "--extra-checks={s}" ) ) ;
1113
1115
}
1114
1116
let mut args = std:: env:: args_os ( ) ;
Original file line number Diff line number Diff line change @@ -298,7 +298,8 @@ pub struct Config {
298
298
299
299
/// Whether to use the precompiled stage0 libtest with compiletest.
300
300
pub compiletest_use_stage0_libtest : bool ,
301
-
301
+ /// Default value for `--extra-checks`
302
+ pub tidy_extra_checks : Option < String > ,
302
303
pub is_running_on_ci : bool ,
303
304
304
305
/// Cache for determining path modifications
@@ -745,6 +746,7 @@ impl Config {
745
746
jobs,
746
747
compiletest_diff_tool,
747
748
compiletest_use_stage0_libtest,
749
+ tidy_extra_checks,
748
750
mut ccache,
749
751
exclude,
750
752
} = toml. build . unwrap_or_default ( ) ;
@@ -1013,6 +1015,7 @@ impl Config {
1013
1015
optimized_compiler_builtins. unwrap_or ( config. channel != "dev" ) ;
1014
1016
config. compiletest_diff_tool = compiletest_diff_tool;
1015
1017
config. compiletest_use_stage0_libtest = compiletest_use_stage0_libtest. unwrap_or ( true ) ;
1018
+ config. tidy_extra_checks = tidy_extra_checks;
1016
1019
1017
1020
let download_rustc = config. download_rustc_commit . is_some ( ) ;
1018
1021
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! {
69
69
jobs: Option <u32 > = "jobs" ,
70
70
compiletest_diff_tool: Option <String > = "compiletest-diff-tool" ,
71
71
compiletest_use_stage0_libtest: Option <bool > = "compiletest-use-stage0-libtest" ,
72
+ tidy_extra_checks: Option <String > = "tidy-extra-checks" ,
72
73
ccache: Option <StringOrBool > = "ccache" ,
73
74
exclude: Option <Vec <PathBuf >> = "exclude" ,
74
75
}
You can’t perform that action at this time.
0 commit comments