Skip to content

fix: LockManager use OS-aware flock shim#17128

Merged
ehuss merged 2 commits into
rust-lang:masterfrom
weihanglo:lock
Jun 24, 2026
Merged

fix: LockManager use OS-aware flock shim#17128
ehuss merged 2 commits into
rust-lang:masterfrom
weihanglo:lock

Conversation

@weihanglo

Copy link
Copy Markdown
Member

What does this PR try to resolve?

Address the last missing part in -Zfine-grain-locking: #17110 (review)

Resolves #17084

How to test and review this PR?

r? ehuss

@rustbot rustbot added A-filesystem Area: issues with filesystems A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 23, 2026

@ehuss ehuss left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ehuss
ehuss added this pull request to the merge queue Jun 23, 2026
Merged via the queue into rust-lang:master with commit a4277b2 Jun 24, 2026
29 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 24, 2026
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Jun 27, 2026
Update cargo submodules

6 commits in a595d0da21f228b7fdae64d3d5c0e527ea66bb59..a335d47ff8036918d3d548dabd513dc0444096a9
2026-06-20 13:42:59 +0000 to 2026-06-26 20:39:41 +0000
- fix(diag): Remove sometimes-invalid removal suggestions  (rust-lang/cargo#17139)
- feat: Add `-Zhint-msrv` flag (rust-lang/cargo#17106)
- fix: LockManager use OS-aware flock shim (rust-lang/cargo#17128)
- fix: flaky test: sparse_blocking_count (rust-lang/cargo#17130)
- Add Solaris fcntl file locking (rust-lang/cargo#17110)
- fix(test): skip dwp uplift test without packed debuginfo (rust-lang/cargo#17127)

r? ghost
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Jun 27, 2026
Update cargo submodules

6 commits in a595d0da21f228b7fdae64d3d5c0e527ea66bb59..a335d47ff8036918d3d548dabd513dc0444096a9
2026-06-20 13:42:59 +0000 to 2026-06-26 20:39:41 +0000
- fix(diag): Remove sometimes-invalid removal suggestions  (rust-lang/cargo#17139)
- feat: Add `-Zhint-msrv` flag (rust-lang/cargo#17106)
- fix: LockManager use OS-aware flock shim (rust-lang/cargo#17128)
- fix: flaky test: sparse_blocking_count (rust-lang/cargo#17130)
- Add Solaris fcntl file locking (rust-lang/cargo#17110)
- fix(test): skip dwp uplift test without packed debuginfo (rust-lang/cargo#17127)

r? ghost
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Jun 27, 2026
Update cargo submodules

6 commits in a595d0da21f228b7fdae64d3d5c0e527ea66bb59..a335d47ff8036918d3d548dabd513dc0444096a9
2026-06-20 13:42:59 +0000 to 2026-06-26 20:39:41 +0000
- fix(diag): Remove sometimes-invalid removal suggestions  (rust-lang/cargo#17139)
- feat: Add `-Zhint-msrv` flag (rust-lang/cargo#17106)
- fix: LockManager use OS-aware flock shim (rust-lang/cargo#17128)
- fix: flaky test: sparse_blocking_count (rust-lang/cargo#17130)
- Add Solaris fcntl file locking (rust-lang/cargo#17110)
- fix(test): skip dwp uplift test without packed debuginfo (rust-lang/cargo#17127)

r? ghost
@rustbot rustbot added this to the 1.98.0 milestone Jun 27, 2026
faukah pushed a commit to faukah/miri that referenced this pull request Jun 28, 2026
Update cargo submodules

6 commits in a595d0da21f228b7fdae64d3d5c0e527ea66bb59..a335d47ff8036918d3d548dabd513dc0444096a9
2026-06-20 13:42:59 +0000 to 2026-06-26 20:39:41 +0000
- fix(diag): Remove sometimes-invalid removal suggestions  (rust-lang/cargo#17139)
- feat: Add `-Zhint-msrv` flag (rust-lang/cargo#17106)
- fix: LockManager use OS-aware flock shim (rust-lang/cargo#17128)
- fix: flaky test: sparse_blocking_count (rust-lang/cargo#17130)
- Add Solaris fcntl file locking (rust-lang/cargo#17110)
- fix(test): skip dwp uplift test without packed debuginfo (rust-lang/cargo#17127)

r? ghost
pull Bot pushed a commit to Kokoro2336/rust-analyzer that referenced this pull request Jun 29, 2026
Update cargo submodules

6 commits in a595d0da21f228b7fdae64d3d5c0e527ea66bb59..a335d47ff8036918d3d548dabd513dc0444096a9
2026-06-20 13:42:59 +0000 to 2026-06-26 20:39:41 +0000
- fix(diag): Remove sometimes-invalid removal suggestions  (rust-lang/cargo#17139)
- feat: Add `-Zhint-msrv` flag (rust-lang/cargo#17106)
- fix: LockManager use OS-aware flock shim (rust-lang/cargo#17128)
- fix: flaky test: sparse_blocking_count (rust-lang/cargo#17130)
- Add Solaris fcntl file locking (rust-lang/cargo#17110)
- fix(test): skip dwp uplift test without packed debuginfo (rust-lang/cargo#17127)

r? ghost
@weihanglo
weihanglo deleted the lock branch July 6, 2026 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-filesystem Area: issues with filesystems A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Cargo will lose inter-process file locking on Solaris on with 1.98-nightly

3 participants