Fix bootstrap submodule path prefix matching#158960
Merged
rust-bors[bot] merged 1 commit intoJul 10, 2026
Merged
Conversation
rustbot
added
S-waiting-on-author
Member
|
What is |
Contributor
Author
It is not an actual directory/tool in the Rust repo. I used src/tools/cargo-vendor as a synthetic negative test case: it shares the string prefix src/tools/cargo, but it is a sibling-like path rather than a child path, so submodule_path_of_paths must not classify it as being inside the src/tools/cargo submodule. |
rustbot
added
the
S-waiting-on-review
rustbot
removed
the
S-waiting-on-author
Collaborator
|
r? @clubby789 rustbot has assigned @clubby789. Use Why was this reviewer chosen?The reviewer was selected based on:
|
Kobzol
approved these changes
Jul 9, 2026
Member
There was a problem hiding this comment.
It took me a while to understand what is the actual fix, it's this line:
let path = Path::new(path);Not sure if we ever really ran into this in practice, but seems like a reasonable fix. Thank you!
@bors r+ rollup
Contributor
rust-bors
Bot
added
S-waiting-on-bors
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Jul 9, 2026
…fix, r=Kobzol Fix bootstrap submodule path prefix matching Fixes bootstrap submodule detection to use path-component matching instead of raw string prefix matching. This prevents paths like src/tools/cargo-vendor from being treated as inside the src/tools/cargo submodule. Adds a regression test for sibling paths that only share a string prefix with a submodule path.
This was referenced Jul 9, 2026
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 10, 2026
Rollup of 24 pull requests Successful merges: - #150946 (intrinsics: Add a fallback for non-const libm float functions) - #158541 (Move `std::io::Write` to `core::io`) - #156027 (Consider captured regions for opaque type region liveness.) - #156370 (Reject linked dylib EII default overrides) - #156508 (Infer all anonymous lifetimes in assoc consts as `'static`) - #157561 (rustdoc: do not include extra stuff in span) - #158617 (allow mGCA const arguments to fall back to anon consts) - #158645 (Fix splat ICEs and ban it in closures) - #158859 (Improve `-Zls` diagnostic message on `.rs` files) - #158988 (Redo `TokenStreamIter`) - #158347 (Improve generic parameters handling for #[diagnostic::on_const]) - #158384 (Allow BackwardIncompatibleDropHint in polonius legacy) - #158722 (delegation: do not always inherit `ConstArgHasType` predicates) - #158739 (view-types: HIR lowering) - #158877 (borrowck: Keep returned `path` from `best_blame_constraint()` consistent) - #158883 (tests: fix enum-match.rs to handle LLVM 23) - #158886 (Add documentation for the `no_std` attribute) - #158940 (Implement feature `char_to_u32`) - #158951 (Merge three `MaxUniverse`s into one) - #158960 (Fix bootstrap submodule path prefix matching) - #158961 (Reapply "LLVM 23: Run AssignGUIDPass in some places") - #158995 (Use REST API in linkchecker script) - #158996 ([compiler] Implement `PartialOrd` via `Ord` for `Span` and newtype_indexes) - #159036 (bootstrap: expand '@argfile' arguments to rustc shim)
rust-timer
added a commit
that referenced
this pull request
Jul 10, 2026
Rollup merge of #158960 - kn1g78:fix-bootstrap-submodule-prefix, r=Kobzol Fix bootstrap submodule path prefix matching Fixes bootstrap submodule detection to use path-component matching instead of raw string prefix matching. This prevents paths like src/tools/cargo-vendor from being treated as inside the src/tools/cargo submodule. Adds a regression test for sibling paths that only share a string prefix with a submodule path.
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.
Fixes bootstrap submodule detection to use path-component matching instead of raw string prefix matching.
This prevents paths like src/tools/cargo-vendor from being treated as inside the src/tools/cargo submodule.
Adds a regression test for sibling paths that only share a string prefix with a submodule path.