remove solaris implementation for File::lock, it has the wrong semantics#157509

Merged

rust-bors[bot] merged 2 commits into

rust-lang:mainfrom

RalfJung:solaris-file-locks

Jun 7, 2026

RalfJung commented Jun 5, 2026

Member

Fixes #157390
r? @the8472

RalfJung added 2 commits

June 6, 2026 00:09


          remove solaris implementation for File::lock, it has the wrong semantics

b58125b


          use cfg_select for unix file lock implementations

353aa6d

rustbot commented Jun 5, 2026

Collaborator

The Miri subtree was changed

cc @rust-lang/miri

rustbot added S-waiting-on-review T-libs labels

rustbot assigned the8472

RalfJung added the relnotes label

rustbot mentioned this pull request

Tracking issue for release notes of #157509: remove solaris implementation for File::lock, it has the wrong semantics #157510

Open

the8472 commented Jun 5, 2026

Member

Uhh, wait... I previously misread the CFGs... I thought freebsd was also on the unsupported list. Because their manpage is pretty similar to Solaris.

https://man.freebsd.org/cgi/man.cgi?query=flock&sektion=2

NOTES
Locks are on files, not file descriptors.

And it mostly talks about processes owning the lock.

Even macos 😩: https://man.freebsd.org/cgi/man.cgi?query=flock&apropos=0&sektion=2&manpath=macOS+26.4

Considering that is a tier1 target I guess we have to relax the documentation instead.

RalfJung commented Jun 6, 2026 •

edited

Loading

Member Author

Reading that FreeBSD manpage further, it says

That is, file descriptors
duplicated through dup(2) or fork(2) do not result in multiple in-
stances of a lock, but rather multiple references to a single lock.

That sounds like locks are on file descriptions, not file descriptors. That's quite reasonable and entirely consistent with Linux and our docs.

Also note that we have a test which ensures that locks are not per-process:

rust/library/std/src/fs/tests.rs

Lines 229 to 243 in 18159d4

    
           fn file_lock_blocking() { 
        
               let tmpdir = tmpdir(); 
        
               let filename = &tmpdir.join("file_lock_blocking_test.txt"); 
        
               let f1 = check!(File::create(filename)); 
        
               let f2 = check!(OpenOptions::new().write(true).open(filename)); 
        
               // Check that shared locks block exclusive locks 
        
               check!(f1.lock_shared()); 
        
               assert_matches!(f2.try_lock(), Err(TryLockError::WouldBlock)); 
        
               check!(f1.unlock()); 
        
               // Check that exclusive locks block shared locks 
        
               check!(f1.lock()); 
        
               assert_matches!(f2.try_lock_shared(), Err(TryLockError::WouldBlock)); 
        
           }

This test would have failed on Solaris. It apparently passes on macOS. So I think macOS is also doing the sane thing here.

the8472 commented Jun 6, 2026

Member

Hrm, ok, then the manpages are just written in a confusing manner... I guess they mean file description, not files.

rust-bors Bot commented Jun 6, 2026

Contributor

📌 Commit 353aa6d has been approved by the8472

It is now in the queue for this repository.

rust-bors Bot added S-waiting-on-bors and removed S-waiting-on-review labels

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#157509 - RalfJung:solaris-file-locks, r=the…

26ec5cd

…8472

remove solaris implementation for File::lock, it has the wrong semantics

Fixes rust-lang#157390
r? @the8472

JonathanBrouwer mentioned this pull request

Rollup of 10 pull requests #157528

Closed

This was referenced Jun 6, 2026

File locking does not work on Solaris rust-lang/miri#5038

Closed

Support file locking via fcntl rust-lang/miri#5050

Closed

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #157528 - JonathanBrouwer:rollup-GdcbzFn, r=JonathanBro…

5b4af39

…uwer

Rollup of 10 pull requests

Successful merges:

 - #157016 (add `extern "tail"` calling convention)
 - #157264 (diagnostics: Fix ICE building a trait ref in method suggestions)
 - #157488 (compiletest: inject `#![windows_subsystem = "windows"]` to debuginfo tests on Windows)
 - #157509 (remove solaris implementation for File::lock, it has the wrong semantics)
 - #157521 (Rename `SyncView::{as_pin => as_pin_ref}`)
 - #156136 (Move tests box)
 - #157289 (Add infallible primitive type lookups to template arg resolver)
 - #157365 (Revert "LLVM 23: Run AssignGUIDPass in some places")
 - #157494 (Convert `QueryRegionConstraint` into a struct)
 - #157526 (std tests: skip a slow test on Miri)

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#157509 - RalfJung:solaris-file-locks, r=the…

ab43cae

…8472

remove solaris implementation for File::lock, it has the wrong semantics

Fixes rust-lang#157390
r? @the8472

JonathanBrouwer mentioned this pull request

Rollup of 10 pull requests #157530

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#157509 - RalfJung:solaris-file-locks, r=the…

859c0f7

…8472

remove solaris implementation for File::lock, it has the wrong semantics

Fixes rust-lang#157390
r? @the8472

JonathanBrouwer mentioned this pull request

Rollup of 17 pull requests #157536

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#157509 - RalfJung:solaris-file-locks, r=the…

4399e31

…8472

remove solaris implementation for File::lock, it has the wrong semantics

Fixes rust-lang#157390
r? @the8472

JonathanBrouwer mentioned this pull request

Rollup of 17 pull requests #157541

Closed

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #157541 - JonathanBrouwer:rollup-Kf94s03, r=JonathanBro…

179ed75

…uwer

Rollup of 17 pull requests

Successful merges:

 - #157251 (`rust-analyzer` subtree update)
 - #157533 (Subtree sync for rustc_codegen_cranelift)
 - #154742 (Add APIs for case folding to the standard library)
 - #155144 (mir_build: Add an extra intermediate step in MIR building for patterns )
 - #157016 (add `extern "tail"` calling convention)
 - #157264 (diagnostics: Fix ICE building a trait ref in method suggestions)
 - #157386 (Parse deprecated note links separately in rustc_resolve)
 - #157483 (fix windows-gnu TLS leak)
 - #157488 (compiletest: inject `#![windows_subsystem = "windows"]` to debuginfo tests on Windows)
 - #157509 (remove solaris implementation for File::lock, it has the wrong semantics)
 - #157521 (Rename `SyncView::{as_pin => as_pin_ref}`)
 - #156136 (Move tests box)
 - #157365 (Revert "LLVM 23: Run AssignGUIDPass in some places")
 - #157471 (Debug assert that parsed attributes are in the `BUILTIN_ATTRIBUTE_MAP`)
 - #157485 (Rename `errors.rs` file to `diagnostics.rs` (1/N))
 - #157494 (Convert `QueryRegionConstraint` into a struct)
 - #157526 (std tests: skip a slow test on Miri)

Failed merges:

 - #155527 (Replace printables table with `unicode_data.rs` tables)

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #157541 - JonathanBrouwer:rollup-Kf94s03, r=JonathanBro…

20f0a86

…uwer

Rollup of 17 pull requests

Successful merges:

 - #157251 (`rust-analyzer` subtree update)
 - #157533 (Subtree sync for rustc_codegen_cranelift)
 - #154742 (Add APIs for case folding to the standard library)
 - #155144 (mir_build: Add an extra intermediate step in MIR building for patterns )
 - #157016 (add `extern "tail"` calling convention)
 - #157264 (diagnostics: Fix ICE building a trait ref in method suggestions)
 - #157386 (Parse deprecated note links separately in rustc_resolve)
 - #157483 (fix windows-gnu TLS leak)
 - #157488 (compiletest: inject `#![windows_subsystem = "windows"]` to debuginfo tests on Windows)
 - #157509 (remove solaris implementation for File::lock, it has the wrong semantics)
 - #157521 (Rename `SyncView::{as_pin => as_pin_ref}`)
 - #156136 (Move tests box)
 - #157365 (Revert "LLVM 23: Run AssignGUIDPass in some places")
 - #157471 (Debug assert that parsed attributes are in the `BUILTIN_ATTRIBUTE_MAP`)
 - #157485 (Rename `errors.rs` file to `diagnostics.rs` (1/N))
 - #157494 (Convert `QueryRegionConstraint` into a struct)
 - #157526 (std tests: skip a slow test on Miri)

Failed merges:

 - #155527 (Replace printables table with `unicode_data.rs` tables)

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #157541 - JonathanBrouwer:rollup-Kf94s03, r=JonathanBro…

5e9b677

…uwer

Rollup of 17 pull requests

Successful merges:

 - #157251 (`rust-analyzer` subtree update)
 - #157533 (Subtree sync for rustc_codegen_cranelift)
 - #154742 (Add APIs for case folding to the standard library)
 - #155144 (mir_build: Add an extra intermediate step in MIR building for patterns )
 - #157016 (add `extern "tail"` calling convention)
 - #157264 (diagnostics: Fix ICE building a trait ref in method suggestions)
 - #157386 (Parse deprecated note links separately in rustc_resolve)
 - #157483 (fix windows-gnu TLS leak)
 - #157488 (compiletest: inject `#![windows_subsystem = "windows"]` to debuginfo tests on Windows)
 - #157509 (remove solaris implementation for File::lock, it has the wrong semantics)
 - #157521 (Rename `SyncView::{as_pin => as_pin_ref}`)
 - #156136 (Move tests box)
 - #157365 (Revert "LLVM 23: Run AssignGUIDPass in some places")
 - #157471 (Debug assert that parsed attributes are in the `BUILTIN_ATTRIBUTE_MAP`)
 - #157485 (Rename `errors.rs` file to `diagnostics.rs` (1/N))
 - #157494 (Convert `QueryRegionConstraint` into a struct)
 - #157526 (std tests: skip a slow test on Miri)

Failed merges:

 - #155527 (Replace printables table with `unicode_data.rs` tables)

jhpratt added a commit to jhpratt/rust that referenced this pull request


          Rollup merge of rust-lang#157509 - RalfJung:solaris-file-locks, r=the…

61dc651

…8472

remove solaris implementation for File::lock, it has the wrong semantics

Fixes rust-lang#157390
r? @the8472

jhpratt mentioned this pull request

Rollup of 21 pull requests #157554

Closed

jhpratt added a commit to jhpratt/rust that referenced this pull request


          Rollup merge of rust-lang#157509 - RalfJung:solaris-file-locks, r=the…

64bc27d

…8472

remove solaris implementation for File::lock, it has the wrong semantics

Fixes rust-lang#157390
r? @the8472

This was referenced Jun 7, 2026

Rollup of 22 pull requests #157555

Closed

Rollup of 25 pull requests #157558

Merged

rust-bors Bot pushed a commit that referenced this pull request


          Auto merge of #157558 - jhpratt:rollup-DWtXTfN, r=jhpratt

43a4909

Rollup of 25 pull requests

Successful merges:

 - #157251 (`rust-analyzer` subtree update)
 - #157533 (Subtree sync for rustc_codegen_cranelift)
 - #154742 (Add APIs for case folding to the standard library)
 - #155144 (mir_build: Add an extra intermediate step in MIR building for patterns )
 - #156222 (Stabilize `Result::map_or_default` and `Option::map_or_default`)
 - #157016 (add `extern "tail"` calling convention)
 - #157264 (diagnostics: Fix ICE building a trait ref in method suggestions)
 - #157386 (Parse deprecated note links separately in rustc_resolve)
 - #157483 (fix windows-gnu TLS leak)
 - #157488 (compiletest: inject `#![windows_subsystem = "windows"]` to debuginfo tests on Windows)
 - #157509 (remove solaris implementation for File::lock, it has the wrong semantics)
 - #157521 (Rename `SyncView::{as_pin => as_pin_ref}`)
 - #156136 (Move tests box)
 - #156573 (Add unwinder_private_data_size for wasm64 target)
 - #156783 (docs: make `Rc::into_raw` clickable in `Rc::increment_strong_count` doc)
 - #156840 (Stabilize `PathBuf::into_string`)
 - #156936 (Remove FIXME about impl PinCoerceUnsized for UnsafePinned<T>)
 - #157365 (Revert "LLVM 23: Run AssignGUIDPass in some places")
 - #157380 (clarify compiler_fence (and fence) docs)
 - #157471 (Debug assert that parsed attributes are in the `BUILTIN_ATTRIBUTE_MAP`)
 - #157485 (Rename `errors.rs` file to `diagnostics.rs` (1/N))
 - #157494 (Convert `QueryRegionConstraint` into a struct)
 - #157526 (std tests: skip a slow test on Miri)
 - #157531 (ci: bump x86_64-gnu base image to 26.04)
 - #157556 (Add `BTree::append()` change to 1.96.0 relnotes)

Failed merges:

 - #155527 (Replace printables table with `unicode_data.rs` tables)

rust-bors Bot merged commit e828638 into rust-lang:main

12 checks passed

rustbot added this to the 1.98.0 milestone

rust-timer added a commit that referenced this pull request


          Unrolled build for #157509

edde8b1

Rollup merge of #157509 - RalfJung:solaris-file-locks, r=the8472

remove solaris implementation for File::lock, it has the wrong semantics

Fixes #157390
r? @the8472

RalfJung deleted the solaris-file-locks branch

June 7, 2026 09:30

pull Bot pushed a commit to asukaminato0721/rust-analyzer that referenced this pull request


          Auto merge of #157558 - jhpratt:rollup-DWtXTfN, r=jhpratt

5935dd5

Rollup of 25 pull requests

Successful merges:

 - rust-lang/rust#157251 (`rust-analyzer` subtree update)
 - rust-lang/rust#157533 (Subtree sync for rustc_codegen_cranelift)
 - rust-lang/rust#154742 (Add APIs for case folding to the standard library)
 - rust-lang/rust#155144 (mir_build: Add an extra intermediate step in MIR building for patterns )
 - rust-lang/rust#156222 (Stabilize `Result::map_or_default` and `Option::map_or_default`)
 - rust-lang/rust#157016 (add `extern "tail"` calling convention)
 - rust-lang/rust#157264 (diagnostics: Fix ICE building a trait ref in method suggestions)
 - rust-lang/rust#157386 (Parse deprecated note links separately in rustc_resolve)
 - rust-lang/rust#157483 (fix windows-gnu TLS leak)
 - rust-lang/rust#157488 (compiletest: inject `#![windows_subsystem = "windows"]` to debuginfo tests on Windows)
 - rust-lang/rust#157509 (remove solaris implementation for File::lock, it has the wrong semantics)
 - rust-lang/rust#157521 (Rename `SyncView::{as_pin => as_pin_ref}`)
 - rust-lang/rust#156136 (Move tests box)
 - rust-lang/rust#156573 (Add unwinder_private_data_size for wasm64 target)
 - rust-lang/rust#156783 (docs: make `Rc::into_raw` clickable in `Rc::increment_strong_count` doc)
 - rust-lang/rust#156840 (Stabilize `PathBuf::into_string`)
 - rust-lang/rust#156936 (Remove FIXME about impl PinCoerceUnsized for UnsafePinned<T>)
 - rust-lang/rust#157365 (Revert "LLVM 23: Run AssignGUIDPass in some places")
 - rust-lang/rust#157380 (clarify compiler_fence (and fence) docs)
 - rust-lang/rust#157471 (Debug assert that parsed attributes are in the `BUILTIN_ATTRIBUTE_MAP`)
 - rust-lang/rust#157485 (Rename `errors.rs` file to `diagnostics.rs` (1/N))
 - rust-lang/rust#157494 (Convert `QueryRegionConstraint` into a struct)
 - rust-lang/rust#157526 (std tests: skip a slow test on Miri)
 - rust-lang/rust#157531 (ci: bump x86_64-gnu base image to 26.04)
 - rust-lang/rust#157556 (Add `BTree::append()` change to 1.96.0 relnotes)

Failed merges:

 - rust-lang/rust#155527 (Replace printables table with `unicode_data.rs` tables)

weihanglo mentioned this pull request

Cargo will lose inter-process file locking on Solaris on with 1.98-nightly rust-lang/cargo#17084

Open

pull Bot pushed a commit to xtqqczze/rust-lang-miri that referenced this pull request


          Auto merge of #157558 - jhpratt:rollup-DWtXTfN, r=jhpratt

6f055b2

Rollup of 25 pull requests

Successful merges:

 - rust-lang/rust#157251 (`rust-analyzer` subtree update)
 - rust-lang/rust#157533 (Subtree sync for rustc_codegen_cranelift)
 - rust-lang/rust#154742 (Add APIs for case folding to the standard library)
 - rust-lang/rust#155144 (mir_build: Add an extra intermediate step in MIR building for patterns )
 - rust-lang/rust#156222 (Stabilize `Result::map_or_default` and `Option::map_or_default`)
 - rust-lang/rust#157016 (add `extern "tail"` calling convention)
 - rust-lang/rust#157264 (diagnostics: Fix ICE building a trait ref in method suggestions)
 - rust-lang/rust#157386 (Parse deprecated note links separately in rustc_resolve)
 - rust-lang/rust#157483 (fix windows-gnu TLS leak)
 - rust-lang/rust#157488 (compiletest: inject `#![windows_subsystem = "windows"]` to debuginfo tests on Windows)
 - rust-lang/rust#157509 (remove solaris implementation for File::lock, it has the wrong semantics)
 - rust-lang/rust#157521 (Rename `SyncView::{as_pin => as_pin_ref}`)
 - rust-lang/rust#156136 (Move tests box)
 - rust-lang/rust#156573 (Add unwinder_private_data_size for wasm64 target)
 - rust-lang/rust#156783 (docs: make `Rc::into_raw` clickable in `Rc::increment_strong_count` doc)
 - rust-lang/rust#156840 (Stabilize `PathBuf::into_string`)
 - rust-lang/rust#156936 (Remove FIXME about impl PinCoerceUnsized for UnsafePinned<T>)
 - rust-lang/rust#157365 (Revert "LLVM 23: Run AssignGUIDPass in some places")
 - rust-lang/rust#157380 (clarify compiler_fence (and fence) docs)
 - rust-lang/rust#157471 (Debug assert that parsed attributes are in the `BUILTIN_ATTRIBUTE_MAP`)
 - rust-lang/rust#157485 (Rename `errors.rs` file to `diagnostics.rs` (1/N))
 - rust-lang/rust#157494 (Convert `QueryRegionConstraint` into a struct)
 - rust-lang/rust#157526 (std tests: skip a slow test on Miri)
 - rust-lang/rust#157531 (ci: bump x86_64-gnu base image to 26.04)
 - rust-lang/rust#157556 (Add `BTree::append()` change to 1.96.0 relnotes)

Failed merges:

 - rust-lang/rust#155527 (Replace printables table with `unicode_data.rs` tables)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

relnotes S-waiting-on-bors T-libs