bootstrap: Replace ShouldRun::crates with crate_or_deps_filtered#159205
Merged
Conversation
This implementation of `should_run` was identical to `crate_or_deps`.
The only remaining direct caller of `crates` was the `compile::Rustc` step, which wants to remove `rustc-main` from the expanded list of in-tree crates.
rustbot
added
S-waiting-on-review
Collaborator
|
r? @clubby789 rustbot has assigned @clubby789. Use Why was this reviewer chosen?The reviewer was selected based on:
|
jieyouxu
approved these changes
Jul 13, 2026
Contributor
rust-bors
Bot
added
S-waiting-on-bors
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 13, 2026
Rollup of 11 pull requests Successful merges: - #159210 (`rust-analyzer` subtree update) - #158655 (Fix coroutine MIR saved local remapping) - #159205 (bootstrap: Replace `ShouldRun::crates` with `crate_or_deps_filtered`) - #159208 (Fix `attr_on_non_tail_expr` typo) - #157524 (Fix relative paths in private import suggestions) - #158325 (Document NonNull layout guarantees) - #158882 (enable `do_not_recommend` attr for method call errors in current solver) - #158982 (Pretty-print MIR user types too.) - #159069 (Add codegen test for constant returns after local use) - #159163 (rustc_target: Add acquire-release to implied features of v8) - #159201 (borrowck: Represent 'best blame constraint' as index into `Vec<OutlivesConstraint>`)
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 13, 2026
Rollup of 11 pull requests Successful merges: - #159210 (`rust-analyzer` subtree update) - #158655 (Fix coroutine MIR saved local remapping) - #159205 (bootstrap: Replace `ShouldRun::crates` with `crate_or_deps_filtered`) - #159208 (Fix `attr_on_non_tail_expr` typo) - #157524 (Fix relative paths in private import suggestions) - #158325 (Document NonNull layout guarantees) - #158882 (enable `do_not_recommend` attr for method call errors in current solver) - #158982 (Pretty-print MIR user types too.) - #159069 (Add codegen test for constant returns after local use) - #159163 (rustc_target: Add acquire-release to implied features of v8) - #159201 (borrowck: Represent 'best blame constraint' as index into `Vec<OutlivesConstraint>`)
rust-timer
added a commit
that referenced
this pull request
Jul 13, 2026
Rollup merge of #159205 - Zalathar:crate-or-deps, r=jieyouxu bootstrap: Replace `ShouldRun::crates` with `crate_or_deps_filtered` This PR is a small cleanup to `ShouldRun`. The `ShouldRun::crates` method has a comment indicating that `crate_or_deps` should be called instead if possible. Of the two existing callers: - `clean_crate_tree!` can easily use `crate_or_deps` instead. - `compile::Rustc` only needs to be able to remove a specific crate from the list of crates. If we incorporate that filtering into an underlying `crate_or_deps_filtered` method, we can get rid of the `crates` method and its awkward do-not-use comment. Our existing snapshot tests seem to indicate that there is no behavioural change. --- I'm not entirely convinced that the `compile::Rustc` step even needs that special behaviour, but step/dependency handling is subtle enough that I'm reluctant to remove it entirely without a better understanding of the fine details. (The sorting change is an unrelated cleanup of some semi-related code that I happened to notice while working on the main changes.)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR is a small cleanup to
ShouldRun.The
ShouldRun::cratesmethod has a comment indicating thatcrate_or_depsshould be called instead if possible. Of the two existing callers:clean_crate_tree!can easily usecrate_or_depsinstead.compile::Rustconly needs to be able to remove a specific crate from the list of crates.If we incorporate that filtering into an underlying
crate_or_deps_filteredmethod, we can get rid of thecratesmethod and its awkward do-not-use comment. Our existing snapshot tests seem to indicate that there is no behavioural change.I'm not entirely convinced that the
compile::Rustcstep even needs that special behaviour, but step/dependency handling is subtle enough that I'm reluctant to remove it entirely without a better understanding of the fine details.(The sorting change is an unrelated cleanup of some semi-related code that I happened to notice while working on the main changes.)