Fixed incorrect locking logic when artifact-dir == build-dir #16385
+30
−3
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
weihanglo
approved these changes
Dec 12, 2025
Member
|
Let me know if you're willing to do a beta-backport, @ranger-ross. No worries if you are busy. For cherry-picking, it would need this PR, as well as #16380 to make CI happy, and should be filed against the branch https://github.com/rust-lang/cargo/tree/rust-1.93.0. (See doc) |
Member
Author
|
sure I can take a crack at it :) |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Member
|
The same flakiness on aarch64-pc-windows-msvc (again) requeuing |
rustbot
removed
the
S-waiting-on-review
weihanglo
added a commit
that referenced
this pull request
Dec 12, 2025
### What does this PR try to resolve? This PR backports #16385 along with some test fixes from #16380 to make CI happy. ### How to test and review this PR? r? @weihanglo
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 fixes incorrect locking behavior in
layout.rsthat forgets to lock thebuild-dirwhenbuild-dir == artifact-dir.This is problematic is the default for both are
$WORKSPACE/targetand I overlooked this :(Issue reported in #16384
How to test and review this PR?
See the tests. You can also run
cargo checkand check for the presence of.cargo-lockr? @weihanglo