user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

enable flock for illumos

Browse source 
(cherry picked from commit 3d9c69b594)
This commit is contained in:
Emily Albini 2025-10-31 10:07:23 +01:00 • committed by Josh Stone
parent 786168f456
commit 4061cf63d0
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/std/src/fs/tests.rs
View file

@ -5,6 +5,7 @@ use rand::RngCore;
target_os = "freebsd",
target_os = "linux",
target_os = "netbsd",
target_os = "illumos",
target_vendor = "apple",
))]
use crate::assert_matches::assert_matches;
@ -14,6 +15,7 @@ use crate::char::MAX_LEN_UTF8;
target_os = "freebsd",
target_os = "linux",
target_os = "netbsd",
target_os = "illumos",
target_vendor = "apple",
))]
use crate::fs::TryLockError;
@ -227,6 +229,7 @@ fn file_test_io_seek_and_write() {
target_os = "linux",
target_os = "netbsd",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
))]
fn file_lock_multiple_shared() {
@ -251,6 +254,7 @@ fn file_lock_multiple_shared() {
target_os = "linux",
target_os = "netbsd",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
))]
fn file_lock_blocking() {
@ -276,6 +280,7 @@ fn file_lock_blocking() {
target_os = "linux",
target_os = "netbsd",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
))]
fn file_lock_drop() {
@ -298,6 +303,7 @@ fn file_lock_drop() {
target_os = "linux",
target_os = "netbsd",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
))]
fn file_lock_dup() {

10
library/std/src/sys/fs/unix.rs
View file

@ -1292,6 +1292,7 @@ impl File {
target_os = "netbsd",
target_os = "openbsd",
target_os = "cygwin",
target_os = "illumos",
target_vendor = "apple",
))]
pub fn lock(&self) -> io::Result<()> {
@ -1316,6 +1317,7 @@ impl File {
target_os = "openbsd",
target_os = "cygwin",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
)))]
pub fn lock(&self) -> io::Result<()> {
@ -1329,6 +1331,7 @@ impl File {
target_os = "netbsd",
target_os = "openbsd",
target_os = "cygwin",
target_os = "illumos",
target_vendor = "apple",
))]
pub fn lock_shared(&self) -> io::Result<()> {
@ -1353,6 +1356,7 @@ impl File {
target_os = "openbsd",
target_os = "cygwin",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
)))]
pub fn lock_shared(&self) -> io::Result<()> {
@ -1366,6 +1370,7 @@ impl File {
target_os = "netbsd",
target_os = "openbsd",
target_os = "cygwin",
target_os = "illumos",
target_vendor = "apple",
))]
pub fn try_lock(&self) -> Result<(), TryLockError> {
@ -1406,6 +1411,7 @@ impl File {
target_os = "openbsd",
target_os = "cygwin",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
)))]
pub fn try_lock(&self) -> Result<(), TryLockError> {
@ -1422,6 +1428,7 @@ impl File {
target_os = "netbsd",
target_os = "openbsd",
target_os = "cygwin",
target_os = "illumos",
target_vendor = "apple",
))]
pub fn try_lock_shared(&self) -> Result<(), TryLockError> {
@ -1462,6 +1469,7 @@ impl File {
target_os = "openbsd",
target_os = "cygwin",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
)))]
pub fn try_lock_shared(&self) -> Result<(), TryLockError> {
@ -1478,6 +1486,7 @@ impl File {
target_os = "netbsd",
target_os = "openbsd",
target_os = "cygwin",
target_os = "illumos",
target_vendor = "apple",
))]
pub fn unlock(&self) -> io::Result<()> {
@ -1502,6 +1511,7 @@ impl File {
target_os = "openbsd",
target_os = "cygwin",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
)))]
pub fn unlock(&self) -> io::Result<()> {