bootstrap: Don't produce mutated/filtered PathSets during command-line matching - #160430
Merged
Conversation
This is not meant as a 1:1 migration. Think of it as removing some older tests of questionable value, then using them as inspiration for some new snapshot-test cases.
For this step, skipping "rustdoc" should prevent `src/librustdoc` from being tested.
Collaborator
|
r? @clubby789 rustbot has assigned @clubby789. Use Why was this reviewer chosen?The reviewer was selected based on:
|
jieyouxu
approved these changes
Aug 4, 2026
Contributor
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Aug 4, 2026
bootstrap: Don't produce mutated/filtered PathSets during command-line matching A single CommandLineStep can register ”multiple paths” along two different axes: - Registering multiple `PathSet`s - Registering an individual `PathSet` containing multiple paths In the latter case (a PathSet containing multiple paths), the intent is that those paths represent multiple names for the *same* unit of work, not separate units of work. It therefore does not make sense to create a modified copy of the PathSet that removes some paths, which is what the path-matching code currently does. This PR therefore removes the code for producing filtered copies of a PathSet. If a multi-path PathSet is matched by a command-line selector, the entire PathSet will be considered matched. The only steps that register multi-path PathSets are rustdoc-related ones, and we can be pretty confident that they aren't relying on the current (questionable) behaviour. There should be no change to user-facing bootstrap behaviour.
This was referenced Aug 4, 2026
rust-bors Bot
pushed a commit
that referenced
this pull request
Aug 5, 2026
…uwer Rollup of 22 pull requests Successful merges: - #160426 (`rust-analyzer` subtree update) - #160372 (Derive the allocator used by tools from rustc's allocator) - #146882 (fully deprecate the legacy integral modules) - #158727 (std: use `readdir` on nearly all UNIX platforms) - #159727 (Various steps in moving away from the big reflection enum to reflection functions) - #160443 (normalize in relations, not generalize, when relating infer with alias) - #160457 (implement -Zllvm-target-feature) - #160480 (Single-pass ASCII lower/upper case conversion) - #160502 (Reduce number of miri tests executed on PR CI) - #157430 (std::random: use little-endian for reproducibility) - #158110 (fix macro attribute feature-gate span) - #159975 (Use real ThinVec in StmtDebugInfos) - #160001 (Suggest mutable method when iterating over binding) - #160024 (Fix mono reachability with no-op landing pads) - #160154 (Add regression test for HRTB associated type projection closure) - #160176 (No more `tests/ui/issues`!) - #160326 (Remove hidden_glob_reexports) - #160407 (Add regression tests for a number of ICEs and diagnostics issues labelled `E-needs-test`) - #160430 (bootstrap: Don't produce mutated/filtered PathSets during command-line matching) - #160472 (Minor fixes to `core::io` & `alloc::io` Documentation) - #160486 (Remove unused `FreeRegionsVisitor`) - #160496 (clarify non-determinism docs for algebraic operations) Failed merges: - #160501 (Add bootstrap CLI snapshot test for testing miri)
rust-timer
added a commit
that referenced
this pull request
Aug 5, 2026
Rollup merge of #160430 - Zalathar:filtration, r=jieyouxu bootstrap: Don't produce mutated/filtered PathSets during command-line matching A single CommandLineStep can register ”multiple paths” along two different axes: - Registering multiple `PathSet`s - Registering an individual `PathSet` containing multiple paths In the latter case (a PathSet containing multiple paths), the intent is that those paths represent multiple names for the *same* unit of work, not separate units of work. It therefore does not make sense to create a modified copy of the PathSet that removes some paths, which is what the path-matching code currently does. This PR therefore removes the code for producing filtered copies of a PathSet. If a multi-path PathSet is matched by a command-line selector, the entire PathSet will be considered matched. The only steps that register multi-path PathSets are rustdoc-related ones, and we can be pretty confident that they aren't relying on the current (questionable) behaviour. There should be no change to user-facing bootstrap behaviour.
RalfJung
pushed a commit
to rust-lang/miri
that referenced
this pull request
Aug 5, 2026
…uwer Rollup of 22 pull requests Successful merges: - rust-lang/rust#160426 (`rust-analyzer` subtree update) - rust-lang/rust#160372 (Derive the allocator used by tools from rustc's allocator) - rust-lang/rust#146882 (fully deprecate the legacy integral modules) - rust-lang/rust#158727 (std: use `readdir` on nearly all UNIX platforms) - rust-lang/rust#159727 (Various steps in moving away from the big reflection enum to reflection functions) - rust-lang/rust#160443 (normalize in relations, not generalize, when relating infer with alias) - rust-lang/rust#160457 (implement -Zllvm-target-feature) - rust-lang/rust#160480 (Single-pass ASCII lower/upper case conversion) - rust-lang/rust#160502 (Reduce number of miri tests executed on PR CI) - rust-lang/rust#157430 (std::random: use little-endian for reproducibility) - rust-lang/rust#158110 (fix macro attribute feature-gate span) - rust-lang/rust#159975 (Use real ThinVec in StmtDebugInfos) - rust-lang/rust#160001 (Suggest mutable method when iterating over binding) - rust-lang/rust#160024 (Fix mono reachability with no-op landing pads) - rust-lang/rust#160154 (Add regression test for HRTB associated type projection closure) - rust-lang/rust#160176 (No more `tests/ui/issues`!) - rust-lang/rust#160326 (Remove hidden_glob_reexports) - rust-lang/rust#160407 (Add regression tests for a number of ICEs and diagnostics issues labelled `E-needs-test`) - rust-lang/rust#160430 (bootstrap: Don't produce mutated/filtered PathSets during command-line matching) - rust-lang/rust#160472 (Minor fixes to `core::io` & `alloc::io` Documentation) - rust-lang/rust#160486 (Remove unused `FreeRegionsVisitor`) - rust-lang/rust#160496 (clarify non-determinism docs for algebraic operations) Failed merges: - rust-lang/rust#160501 (Add bootstrap CLI snapshot test for testing miri)
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.
A single CommandLineStep can register ”multiple paths” along two different axes:
PathSetsPathSetcontaining multiple pathsIn the latter case (a PathSet containing multiple paths), the intent is that those paths represent multiple names for the same unit of work, not separate units of work. It therefore does not make sense to create a modified copy of the PathSet that removes some paths, which is what the path-matching code currently does.
This PR therefore removes the code for producing filtered copies of a PathSet. If a multi-path PathSet is matched by a command-line selector, the entire PathSet will be considered matched.
The only steps that register multi-path PathSets are rustdoc-related ones, and we can be pretty confident that they aren't relying on the current (questionable) behaviour.
There should be no change to user-facing bootstrap behaviour.