[beta-1.96] Always take a shared lock on .cargo-lock#16887
Merged
epage merged 1 commit intorust-lang:rust-1.96.0from Apr 15, 2026
Merged
[beta-1.96] Always take a shared lock on .cargo-lock#16887epage merged 1 commit intorust-lang:rust-1.96.0from
.cargo-lock#16887epage merged 1 commit intorust-lang:rust-1.96.0from
Conversation
This commit changes the behavior to always take a shared lock on `.cargo-lock` to ensure backwards compatiblity with older versions of cargo that do not lock `.cargo-build-lock`. To allow `cargo check` and `cargo build` to continue running concurrently `.cargo-artifact-lock` was added with the original behavior of `.cargo-lock`.
rustbot
added
A-layout
Collaborator
|
r? @epage rustbot has assigned @epage. Use Why was this reviewer chosen?The reviewer was selected based on:
|
Collaborator
|
epage
approved these changes
Apr 15, 2026
rustbot
removed
the
S-waiting-on-review
rust-bors bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Apr 15, 2026
[beta-1.96] Update cargo submodule 1 commits in eb94155a9a60943bd7b1cb04abec42f5d0de6ddc..9fb171546a9db5513062de20df78116ed5ee7668 2026-04-09 13:10:20 +0000 to 2026-04-14 20:13:35 -0500 - [beta-1.96] Always take a shared lock on `.cargo-lock` (rust-lang/cargo#16887) r? ghost
rust-bors bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Apr 15, 2026
[beta-1.96] Update cargo submodule 1 commits in eb94155a9a60943bd7b1cb04abec42f5d0de6ddc..9fb171546a9db5513062de20df78116ed5ee7668 2026-04-09 13:10:20 +0000 to 2026-04-14 20:13:35 -0500 - [beta-1.96] Always take a shared lock on `.cargo-lock` (rust-lang/cargo#16887) r? ghost
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
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.
Beta backports
.cargo-lock#16886To resolve a regression locking compatibility with older versions (see: #16853)