Auto merge of #148322 - oxidecomputer:ea-flock-illumos, r=<try>

Enable file locking support in illumos

try-job: arm-android

Author: rust-bors[bot]

library/std/src/fs/tests.rs

@@ -5,6 +5,8 @@ use rand::RngCore;
     target_os = "freebsd",
     target_os = "linux",
     target_os = "netbsd",
+    target_os = "illumos",
+    target_os = "android",
     target_vendor = "apple",
 ))]
 use crate::assert_matches::assert_matches;
@@ -14,6 +16,8 @@ use crate::char::MAX_LEN_UTF8;
     target_os = "freebsd",
     target_os = "linux",
     target_os = "netbsd",
+    target_os = "illumos",
+    target_os = "android",
     target_vendor = "apple",
 ))]
 use crate::fs::TryLockError;
@@ -227,6 +231,8 @@ fn file_test_io_seek_and_write() {
     target_os = "linux",
     target_os = "netbsd",
     target_os = "solaris",
+    target_os = "illumos",
+    target_os = "android",
     target_vendor = "apple",
 ))]
 fn file_lock_multiple_shared() {
@@ -251,6 +257,8 @@ fn file_lock_multiple_shared() {
     target_os = "linux",
     target_os = "netbsd",
     target_os = "solaris",
+    target_os = "illumos",
+    target_os = "android",
     target_vendor = "apple",
 ))]
 fn file_lock_blocking() {
@@ -276,6 +284,8 @@ fn file_lock_blocking() {
     target_os = "linux",
     target_os = "netbsd",
     target_os = "solaris",
+    target_os = "illumos",
+    target_os = "android",
     target_vendor = "apple",
 ))]
 fn file_lock_drop() {
@@ -298,6 +308,8 @@ fn file_lock_drop() {
     target_os = "linux",
     target_os = "netbsd",
     target_os = "solaris",
+    target_os = "illumos",
+    target_os = "android",
     target_vendor = "apple",
 ))]
 fn file_lock_dup() {

library/std/src/sys/fs/unix.rs

@@ -1292,6 +1292,8 @@ impl File {
         target_os = "netbsd",
         target_os = "openbsd",
         target_os = "cygwin",
+        target_os = "illumos",
+        target_os = "android",
         target_vendor = "apple",
     ))]
     pub fn lock(&self) -> io::Result<()> {
@@ -1316,6 +1318,8 @@ impl File {
         target_os = "openbsd",
         target_os = "cygwin",
         target_os = "solaris",
+        target_os = "illumos",
+        target_os = "android",
         target_vendor = "apple",
     )))]
     pub fn lock(&self) -> io::Result<()> {
@@ -1329,6 +1333,8 @@ impl File {
         target_os = "netbsd",
         target_os = "openbsd",
         target_os = "cygwin",
+        target_os = "illumos",
+        target_os = "android",
         target_vendor = "apple",
     ))]
     pub fn lock_shared(&self) -> io::Result<()> {
@@ -1353,6 +1359,8 @@ impl File {
         target_os = "openbsd",
         target_os = "cygwin",
         target_os = "solaris",
+        target_os = "illumos",
+        target_os = "android",
         target_vendor = "apple",
     )))]
     pub fn lock_shared(&self) -> io::Result<()> {
@@ -1366,6 +1374,8 @@ impl File {
         target_os = "netbsd",
         target_os = "openbsd",
         target_os = "cygwin",
+        target_os = "illumos",
+        target_os = "android",
         target_vendor = "apple",
     ))]
     pub fn try_lock(&self) -> Result<(), TryLockError> {
@@ -1406,6 +1416,8 @@ impl File {
         target_os = "openbsd",
         target_os = "cygwin",
         target_os = "solaris",
+        target_os = "illumos",
+        target_os = "android",
         target_vendor = "apple",
     )))]
     pub fn try_lock(&self) -> Result<(), TryLockError> {
@@ -1422,6 +1434,8 @@ impl File {
         target_os = "netbsd",
         target_os = "openbsd",
         target_os = "cygwin",
+        target_os = "illumos",
+        target_os = "android",
         target_vendor = "apple",
     ))]
     pub fn try_lock_shared(&self) -> Result<(), TryLockError> {
@@ -1462,6 +1476,8 @@ impl File {
         target_os = "openbsd",
         target_os = "cygwin",
         target_os = "solaris",
+        target_os = "illumos",
+        target_os = "android",
         target_vendor = "apple",
     )))]
     pub fn try_lock_shared(&self) -> Result<(), TryLockError> {
@@ -1478,6 +1494,8 @@ impl File {
         target_os = "netbsd",
         target_os = "openbsd",
         target_os = "cygwin",
+        target_os = "illumos",
+        target_os = "android",
         target_vendor = "apple",
     ))]
     pub fn unlock(&self) -> io::Result<()> {
@@ -1502,6 +1520,8 @@ impl File {
         target_os = "openbsd",
         target_os = "cygwin",
         target_os = "solaris",
+        target_os = "illumos",
+        target_os = "android",
         target_vendor = "apple",
     )))]
     pub fn unlock(&self) -> io::Result<()> {