Do not lock the artifact-dir for check builds + fix uplifting #16307
Conversation
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
rustbot
added
A-layout
epage
approved these changes
Dec 1, 2025
rustbot
removed
the
S-waiting-on-review
This was referenced Dec 2, 2025
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Dec 3, 2025
Update cargo submodule 14 commits in 2a7c4960677971f88458b0f8b461a866836dff59..bd979347d814dfe03bba124165dbce9554d0b4d8 2025-11-25 19:58:07 +0000 to 2025-12-02 16:03:50 +0000 - fix(completion): Put host-tuple before actual tuples (rust-lang/cargo#16327) - fix(lints): use plural form correctly (rust-lang/cargo#16324) - fix(completions): include `all` in `cargo tree --target` candidates (rust-lang/cargo#16322) - fix(lints): show lint error number (rust-lang/cargo#16320) - chore(deps): update compatible (rust-lang/cargo#16318) - chore(deps): update crate-ci/typos action to v1.40.0 (rust-lang/cargo#16316) - Do not lock the artifact-dir for check builds + fix uplifting (rust-lang/cargo#16307) - Properly validate crate names in `cargo install` (rust-lang/cargo#16314) - Support --filter-platform=host for cargo metadata rust-lang/cargo#9423 (rust-lang/cargo#16312) - Update to mdbook 0.5 (rust-lang/cargo#16292) - refactor(clean): Better divide old / new layout (rust-lang/cargo#16304) - update: silent failure on non-matching package specs with --breaking (rust-lang/cargo#16276) - fix(log): break timing-info message to multiple (rust-lang/cargo#16303) - fix(clean): Clean hosts builds with new layout (rust-lang/cargo#16300)
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 3, 2025
### What does this PR try to resolve? Previously if rustc version mismatches, Cargo removes all `doc` directories including target platforms that are not part of the build. This PR makes it `--target` aware and stops excessive cleanup, by putting `.rustdoc_fingerprint.json` in each target platform directory. ### How to test and review this PR? I'd like to reuse this file to track doc parts directories in <#16309>, and noticed that this file is for the entire workspace rather than per-target, hich is not compatible with mergeable cross-crate info JSONs. For concurrent safety, `build-dir` should be locked already since Cargo locks every intent except check (see <#16307>). This file is touched only under `UserIntent::Doc`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
What does this PR try to resolve?
This PR un-reverts the changes from #16230 as well as adds a bug fix for a crash reported in #16297
Note: The bug fix relies on behavior in the reverted code, so I added that back before the bug fix
How to test and review this PR?
I added a new check test that verifies the existing behavior (crash) and is updated to verify no files are added to the target dir with no crash.
r? @epage
cc: @stewartadam (thanks, again for the bug report)
Fixes #16305