Skip to content

bootstrap: Don't pass Kind to some places that don't need it #160191

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.

Sign up for GitHub

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

Merged
rust-bors merged 3 commits into from
Aug 3, 2026
Merged

bootstrap: Don't pass Kind to some places that don't need it #160191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc6e0ad
Avoid inappropriate `--skip` handling in `run_default_doc_steps`
Zalathar Jul 30, 2026
1cadc4b
Don't pass `Kind` into `PathSet::check`
Zalathar Jul 29, 2026
4ca76aa
Don't include `Kind` in `TaskPath`
Zalathar Jul 29, 2026
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
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/builder/cli_paths.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ pub(crate) fn match_paths_to_steps_and_run(
let mut steps_to_run = vec![];

for StepExtra { desc, should_run } in &steps {
let pathsets = should_run.pathset_for_paths_removing_matches(&mut paths, desc.kind);
let pathsets = should_run.pathset_for_paths_removing_matches(&mut paths);

// This value is used for sorting the step execution order.
// By default, `usize::MAX` is used as the index for steps to assign them the lowest priority.
Expand Down
178 changes: 89 additions & 89 deletions src/bootstrap/src/core/builder/cli_paths/snapshots/x_bench.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,96 +4,96 @@ expression: bench
---
[Bench] test::Crate
targets: [aarch64-unknown-linux-gnu]
- Set({bench::library/alloc})
- Set({bench::library/alloctests})
- Set({bench::library/compiler-builtins/compiler-builtins})
- Set({bench::library/core})
- Set({bench::library/coretests})
- Set({bench::library/panic_abort})
- Set({bench::library/panic_unwind})
- Set({bench::library/proc_macro})
- Set({bench::library/rustc-std-workspace-core})
- Set({bench::library/std})
- Set({bench::library/std_detect})
- Set({bench::library/sysroot})
- Set({bench::library/test})
- Set({bench::library/unwind})
- Set({library/alloc})
- Set({library/alloctests})
- Set({library/compiler-builtins/compiler-builtins})
- Set({library/core})
- Set({library/coretests})
- Set({library/panic_abort})
- Set({library/panic_unwind})
- Set({library/proc_macro})
- Set({library/rustc-std-workspace-core})
- Set({library/std})
- Set({library/std_detect})
- Set({library/sysroot})
- Set({library/test})
- Set({library/unwind})
[Bench] test::CrateLibrustc
targets: [x86_64-unknown-linux-gnu]
- Set({bench::compiler})
- Set({bench::compiler/rustc})
- Set({bench::compiler/rustc_abi})
- Set({bench::compiler/rustc_arena})
- Set({bench::compiler/rustc_ast})
- Set({bench::compiler/rustc_ast_ir})
- Set({bench::compiler/rustc_ast_lowering})
- Set({bench::compiler/rustc_ast_passes})
- Set({bench::compiler/rustc_ast_pretty})
- Set({bench::compiler/rustc_attr_parsing})
- Set({bench::compiler/rustc_baked_icu_data})
- Set({bench::compiler/rustc_borrowck})
- Set({bench::compiler/rustc_builtin_macros})
- Set({bench::compiler/rustc_codegen_llvm})
- Set({bench::compiler/rustc_codegen_ssa})
- Set({bench::compiler/rustc_const_eval})
- Set({bench::compiler/rustc_data_structures})
- Set({bench::compiler/rustc_driver})
- Set({bench::compiler/rustc_driver_impl})
- Set({bench::compiler/rustc_error_codes})
- Set({bench::compiler/rustc_error_messages})
- Set({bench::compiler/rustc_errors})
- Set({bench::compiler/rustc_expand})
- Set({bench::compiler/rustc_feature})
- Set({bench::compiler/rustc_fs_util})
- Set({bench::compiler/rustc_graphviz})
- Set({bench::compiler/rustc_hashes})
- Set({bench::compiler/rustc_hir})
- Set({bench::compiler/rustc_hir_analysis})
- Set({bench::compiler/rustc_hir_id})
- Set({bench::compiler/rustc_hir_pretty})
- Set({bench::compiler/rustc_hir_typeck})
- Set({bench::compiler/rustc_incremental})
- Set({bench::compiler/rustc_index})
- Set({bench::compiler/rustc_index_macros})
- Set({bench::compiler/rustc_infer})
- Set({bench::compiler/rustc_interface})
- Set({bench::compiler/rustc_lexer})
- Set({bench::compiler/rustc_lint})
- Set({bench::compiler/rustc_lint_defs})
- Set({bench::compiler/rustc_llvm})
- Set({bench::compiler/rustc_log})
- Set({bench::compiler/rustc_macros})
- Set({bench::compiler/rustc_metadata})
- Set({bench::compiler/rustc_middle})
- Set({bench::compiler/rustc_mir_build})
- Set({bench::compiler/rustc_mir_dataflow})
- Set({bench::compiler/rustc_mir_transform})
- Set({bench::compiler/rustc_monomorphize})
- Set({bench::compiler/rustc_next_trait_solver})
- Set({bench::compiler/rustc_parse})
- Set({bench::compiler/rustc_parse_format})
- Set({bench::compiler/rustc_passes})
- Set({bench::compiler/rustc_pattern_analysis})
- Set({bench::compiler/rustc_privacy})
- Set({bench::compiler/rustc_proc_macro})
- Set({bench::compiler/rustc_public})
- Set({bench::compiler/rustc_public_bridge})
- Set({bench::compiler/rustc_query_impl})
- Set({bench::compiler/rustc_resolve})
- Set({bench::compiler/rustc_sanitizers})
- Set({bench::compiler/rustc_serialize})
- Set({bench::compiler/rustc_session})
- Set({bench::compiler/rustc_span})
- Set({bench::compiler/rustc_symbol_mangling})
- Set({bench::compiler/rustc_target})
- Set({bench::compiler/rustc_thread_pool})
- Set({bench::compiler/rustc_trait_selection})
- Set({bench::compiler/rustc_traits})
- Set({bench::compiler/rustc_transmute})
- Set({bench::compiler/rustc_ty_utils})
- Set({bench::compiler/rustc_type_ir})
- Set({bench::compiler/rustc_type_ir_macros})
- Set({bench::compiler/rustc_windows_rc})
- Set({compiler})
- Set({compiler/rustc})
- Set({compiler/rustc_abi})
- Set({compiler/rustc_arena})
- Set({compiler/rustc_ast})
- Set({compiler/rustc_ast_ir})
- Set({compiler/rustc_ast_lowering})
- Set({compiler/rustc_ast_passes})
- Set({compiler/rustc_ast_pretty})
- Set({compiler/rustc_attr_parsing})
- Set({compiler/rustc_baked_icu_data})
- Set({compiler/rustc_borrowck})
- Set({compiler/rustc_builtin_macros})
- Set({compiler/rustc_codegen_llvm})
- Set({compiler/rustc_codegen_ssa})
- Set({compiler/rustc_const_eval})
- Set({compiler/rustc_data_structures})
- Set({compiler/rustc_driver})
- Set({compiler/rustc_driver_impl})
- Set({compiler/rustc_error_codes})
- Set({compiler/rustc_error_messages})
- Set({compiler/rustc_errors})
- Set({compiler/rustc_expand})
- Set({compiler/rustc_feature})
- Set({compiler/rustc_fs_util})
- Set({compiler/rustc_graphviz})
- Set({compiler/rustc_hashes})
- Set({compiler/rustc_hir})
- Set({compiler/rustc_hir_analysis})
- Set({compiler/rustc_hir_id})
- Set({compiler/rustc_hir_pretty})
- Set({compiler/rustc_hir_typeck})
- Set({compiler/rustc_incremental})
- Set({compiler/rustc_index})
- Set({compiler/rustc_index_macros})
- Set({compiler/rustc_infer})
- Set({compiler/rustc_interface})
- Set({compiler/rustc_lexer})
- Set({compiler/rustc_lint})
- Set({compiler/rustc_lint_defs})
- Set({compiler/rustc_llvm})
- Set({compiler/rustc_log})
- Set({compiler/rustc_macros})
- Set({compiler/rustc_metadata})
- Set({compiler/rustc_middle})
- Set({compiler/rustc_mir_build})
- Set({compiler/rustc_mir_dataflow})
- Set({compiler/rustc_mir_transform})
- Set({compiler/rustc_monomorphize})
- Set({compiler/rustc_next_trait_solver})
- Set({compiler/rustc_parse})
- Set({compiler/rustc_parse_format})
- Set({compiler/rustc_passes})
- Set({compiler/rustc_pattern_analysis})
- Set({compiler/rustc_privacy})
- Set({compiler/rustc_proc_macro})
- Set({compiler/rustc_public})
- Set({compiler/rustc_public_bridge})
- Set({compiler/rustc_query_impl})
- Set({compiler/rustc_resolve})
- Set({compiler/rustc_sanitizers})
- Set({compiler/rustc_serialize})
- Set({compiler/rustc_session})
- Set({compiler/rustc_span})
- Set({compiler/rustc_symbol_mangling})
- Set({compiler/rustc_target})
- Set({compiler/rustc_thread_pool})
- Set({compiler/rustc_trait_selection})
- Set({compiler/rustc_traits})
- Set({compiler/rustc_transmute})
- Set({compiler/rustc_ty_utils})
- Set({compiler/rustc_type_ir})
- Set({compiler/rustc_type_ir_macros})
- Set({compiler/rustc_windows_rc})
[Bench] test::CrateRustdoc
targets: [x86_64-unknown-linux-gnu]
- Set({bench::src/librustdoc, bench::src/tools/rustdoc})
- Set({src/librustdoc, src/tools/rustdoc})
28 changes: 14 additions & 14 deletions src/bootstrap/src/core/builder/cli_paths/snapshots/x_build.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ expression: build
---
[Build] compile::Std
targets: [aarch64-unknown-linux-gnu]
- Set({build::library})
- Set({build::library/alloc})
- Set({build::library/compiler-builtins/compiler-builtins})
- Set({build::library/core})
- Set({build::library/panic_abort})
- Set({build::library/panic_unwind})
- Set({build::library/proc_macro})
- Set({build::library/rustc-std-workspace-core})
- Set({build::library/std})
- Set({build::library/std_detect})
- Set({build::library/sysroot})
- Set({build::library/test})
- Set({build::library/unwind})
- Set({library})
- Set({library/alloc})
- Set({library/compiler-builtins/compiler-builtins})
- Set({library/core})
- Set({library/panic_abort})
- Set({library/panic_unwind})
- Set({library/proc_macro})
- Set({library/rustc-std-workspace-core})
- Set({library/std})
- Set({library/std_detect})
- Set({library/sysroot})
- Set({library/test})
- Set({library/unwind})
[Build] tool::Rustdoc
targets: [x86_64-unknown-linux-gnu]
- Set({build::src/librustdoc, build::src/tools/rustdoc})
- Set({src/librustdoc, src/tools/rustdoc})
148 changes: 74 additions & 74 deletions src/bootstrap/src/core/builder/cli_paths/snapshots/x_build_compiler.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,79 +4,79 @@ expression: build compiler
---
[Build] compile::Rustc
targets: [x86_64-unknown-linux-gnu]
- Set({build::compiler/rustc_abi})
- Set({build::compiler/rustc_arena})
- Set({build::compiler/rustc_ast})
- Set({build::compiler/rustc_ast_ir})
- Set({build::compiler/rustc_ast_lowering})
- Set({build::compiler/rustc_ast_passes})
- Set({build::compiler/rustc_ast_pretty})
- Set({build::compiler/rustc_attr_parsing})
- Set({build::compiler/rustc_baked_icu_data})
- Set({build::compiler/rustc_borrowck})
- Set({build::compiler/rustc_builtin_macros})
- Set({build::compiler/rustc_codegen_llvm})
- Set({build::compiler/rustc_codegen_ssa})
- Set({build::compiler/rustc_const_eval})
- Set({build::compiler/rustc_data_structures})
- Set({build::compiler/rustc_driver})
- Set({build::compiler/rustc_driver_impl})
- Set({build::compiler/rustc_error_codes})
- Set({build::compiler/rustc_error_messages})
- Set({build::compiler/rustc_errors})
- Set({build::compiler/rustc_expand})
- Set({build::compiler/rustc_feature})
- Set({build::compiler/rustc_fs_util})
- Set({build::compiler/rustc_graphviz})
- Set({build::compiler/rustc_hashes})
- Set({build::compiler/rustc_hir})
- Set({build::compiler/rustc_hir_analysis})
- Set({build::compiler/rustc_hir_id})
- Set({build::compiler/rustc_hir_pretty})
- Set({build::compiler/rustc_hir_typeck})
- Set({build::compiler/rustc_incremental})
- Set({build::compiler/rustc_index})
- Set({build::compiler/rustc_index_macros})
- Set({build::compiler/rustc_infer})
- Set({build::compiler/rustc_interface})
- Set({build::compiler/rustc_lexer})
- Set({build::compiler/rustc_lint})
- Set({build::compiler/rustc_lint_defs})
- Set({build::compiler/rustc_llvm})
- Set({build::compiler/rustc_log})
- Set({build::compiler/rustc_macros})
- Set({build::compiler/rustc_metadata})
- Set({build::compiler/rustc_middle})
- Set({build::compiler/rustc_mir_build})
- Set({build::compiler/rustc_mir_dataflow})
- Set({build::compiler/rustc_mir_transform})
- Set({build::compiler/rustc_monomorphize})
- Set({build::compiler/rustc_next_trait_solver})
- Set({build::compiler/rustc_parse})
- Set({build::compiler/rustc_parse_format})
- Set({build::compiler/rustc_passes})
- Set({build::compiler/rustc_pattern_analysis})
- Set({build::compiler/rustc_privacy})
- Set({build::compiler/rustc_proc_macro})
- Set({build::compiler/rustc_public})
- Set({build::compiler/rustc_public_bridge})
- Set({build::compiler/rustc_query_impl})
- Set({build::compiler/rustc_resolve})
- Set({build::compiler/rustc_sanitizers})
- Set({build::compiler/rustc_serialize})
- Set({build::compiler/rustc_session})
- Set({build::compiler/rustc_span})
- Set({build::compiler/rustc_symbol_mangling})
- Set({build::compiler/rustc_target})
- Set({build::compiler/rustc_thread_pool})
- Set({build::compiler/rustc_trait_selection})
- Set({build::compiler/rustc_traits})
- Set({build::compiler/rustc_transmute})
- Set({build::compiler/rustc_ty_utils})
- Set({build::compiler/rustc_type_ir})
- Set({build::compiler/rustc_type_ir_macros})
- Set({build::compiler/rustc_windows_rc})
- Set({compiler/rustc_abi})
- Set({compiler/rustc_arena})
- Set({compiler/rustc_ast})
- Set({compiler/rustc_ast_ir})
- Set({compiler/rustc_ast_lowering})
- Set({compiler/rustc_ast_passes})
- Set({compiler/rustc_ast_pretty})
- Set({compiler/rustc_attr_parsing})
- Set({compiler/rustc_baked_icu_data})
- Set({compiler/rustc_borrowck})
- Set({compiler/rustc_builtin_macros})
- Set({compiler/rustc_codegen_llvm})
- Set({compiler/rustc_codegen_ssa})
- Set({compiler/rustc_const_eval})
- Set({compiler/rustc_data_structures})
- Set({compiler/rustc_driver})
- Set({compiler/rustc_driver_impl})
- Set({compiler/rustc_error_codes})
- Set({compiler/rustc_error_messages})
- Set({compiler/rustc_errors})
- Set({compiler/rustc_expand})
- Set({compiler/rustc_feature})
- Set({compiler/rustc_fs_util})
- Set({compiler/rustc_graphviz})
- Set({compiler/rustc_hashes})
- Set({compiler/rustc_hir})
- Set({compiler/rustc_hir_analysis})
- Set({compiler/rustc_hir_id})
- Set({compiler/rustc_hir_pretty})
- Set({compiler/rustc_hir_typeck})
- Set({compiler/rustc_incremental})
- Set({compiler/rustc_index})
- Set({compiler/rustc_index_macros})
- Set({compiler/rustc_infer})
- Set({compiler/rustc_interface})
- Set({compiler/rustc_lexer})
- Set({compiler/rustc_lint})
- Set({compiler/rustc_lint_defs})
- Set({compiler/rustc_llvm})
- Set({compiler/rustc_log})
- Set({compiler/rustc_macros})
- Set({compiler/rustc_metadata})
- Set({compiler/rustc_middle})
- Set({compiler/rustc_mir_build})
- Set({compiler/rustc_mir_dataflow})
- Set({compiler/rustc_mir_transform})
- Set({compiler/rustc_monomorphize})
- Set({compiler/rustc_next_trait_solver})
- Set({compiler/rustc_parse})
- Set({compiler/rustc_parse_format})
- Set({compiler/rustc_passes})
- Set({compiler/rustc_pattern_analysis})
- Set({compiler/rustc_privacy})
- Set({compiler/rustc_proc_macro})
- Set({compiler/rustc_public})
- Set({compiler/rustc_public_bridge})
- Set({compiler/rustc_query_impl})
- Set({compiler/rustc_resolve})
- Set({compiler/rustc_sanitizers})
- Set({compiler/rustc_serialize})
- Set({compiler/rustc_session})
- Set({compiler/rustc_span})
- Set({compiler/rustc_symbol_mangling})
- Set({compiler/rustc_target})
- Set({compiler/rustc_thread_pool})
- Set({compiler/rustc_trait_selection})
- Set({compiler/rustc_traits})
- Set({compiler/rustc_transmute})
- Set({compiler/rustc_ty_utils})
- Set({compiler/rustc_type_ir})
- Set({compiler/rustc_type_ir_macros})
- Set({compiler/rustc_windows_rc})
[Build] compile::Assemble
targets: [x86_64-unknown-linux-gnu]
- Set({build::compiler})
- Set({build::compiler/rustc})
- Set({compiler})
- Set({compiler/rustc})
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/builder/cli_paths/snapshots/x_build_compiletest.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ expression: build compiletest
---
[Build] tool::Compiletest
targets: [aarch64-unknown-linux-gnu]
- Set({build::src/tools/compiletest})
- Set({src/tools/compiletest})
Loading
Loading