File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -1125,10 +1125,10 @@ impl Step for Tidy {
11251125 if builder. config . cmd . bless ( ) {
11261126 cmd. arg ( "--bless" ) ;
11271127 }
1128- if let Some ( s ) =
1129- builder. config . cmd . extra_checks ( ) . or ( builder. config . tidy_extra_checks . as_deref ( ) )
1130- {
1131- cmd. arg ( format ! ( "--extra-checks={s }" ) ) ;
1128+ let extra_checks =
1129+ builder. config . cmd . extra_checks ( ) . unwrap_or ( builder. config . tidy_extra_checks . as_str ( ) ) ;
1130+ if !extra_checks . is_empty ( ) {
1131+ cmd. arg ( format ! ( "--extra-checks={extra_checks }" ) ) ;
11321132 }
11331133 let mut args = std:: env:: args_os ( ) ;
11341134 if args. any ( |arg| arg == OsStr :: new ( "--" ) ) {
Original file line number Diff line number Diff line change @@ -299,7 +299,7 @@ pub struct Config {
299299 /// Whether to use the precompiled stage0 libtest with compiletest.
300300 pub compiletest_use_stage0_libtest : bool ,
301301 /// Default value for `--extra-checks`
302- pub tidy_extra_checks : Option < String > ,
302+ pub tidy_extra_checks : String ,
303303 pub is_running_on_ci : bool ,
304304
305305 /// Cache for determining path modifications
@@ -1014,7 +1014,8 @@ impl Config {
10141014 optimized_compiler_builtins. unwrap_or ( config. channel != "dev" ) ;
10151015 config. compiletest_diff_tool = compiletest_diff_tool;
10161016 config. compiletest_use_stage0_libtest = compiletest_use_stage0_libtest. unwrap_or ( true ) ;
1017- config. tidy_extra_checks = tidy_extra_checks;
1017+ config. tidy_extra_checks = tidy_extra_checks
1018+ . unwrap_or_else ( || "auto:js,auto:cpp,auto:py,auto:spellcheck" . to_string ( ) ) ;
10181019
10191020 let download_rustc = config. download_rustc_commit . is_some ( ) ;
10201021 config. explicit_stage_from_cli = flags_stage. is_some ( ) ;
You can’t perform that action at this time.
0 commit comments