Skip to content

Commit 9663de0

Browse files
authored
Rollup merge of rust-lang#148619 - amy-kwan:amyk/AddLockingFunctions_AIX, r=workingjubilee
Enable std locking functions on AIX This patch enables the std locking functions on AIX by including AIX on the list of supported targets for the locking functions. Excluding AIX from the std locking functions results to compilation errors such as: ("try_lock() not supported").
2 parents 2fe368d + b827732 commit 9663de0

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,6 +1296,7 @@ impl File {
12961296
target_os = "openbsd",
12971297
target_os = "cygwin",
12981298
target_os = "illumos",
1299+
target_os = "aix",
12991300
target_vendor = "apple",
13001301
))]
13011302
pub fn lock(&self) -> io::Result<()> {
@@ -1321,6 +1322,7 @@ impl File {
13211322
target_os = "cygwin",
13221323
target_os = "solaris",
13231324
target_os = "illumos",
1325+
target_os = "aix",
13241326
target_vendor = "apple",
13251327
)))]
13261328
pub fn lock(&self) -> io::Result<()> {
@@ -1335,6 +1337,7 @@ impl File {
13351337
target_os = "openbsd",
13361338
target_os = "cygwin",
13371339
target_os = "illumos",
1340+
target_os = "aix",
13381341
target_vendor = "apple",
13391342
))]
13401343
pub fn lock_shared(&self) -> io::Result<()> {
@@ -1360,6 +1363,7 @@ impl File {
13601363
target_os = "cygwin",
13611364
target_os = "solaris",
13621365
target_os = "illumos",
1366+
target_os = "aix",
13631367
target_vendor = "apple",
13641368
)))]
13651369
pub fn lock_shared(&self) -> io::Result<()> {
@@ -1374,6 +1378,7 @@ impl File {
13741378
target_os = "openbsd",
13751379
target_os = "cygwin",
13761380
target_os = "illumos",
1381+
target_os = "aix",
13771382
target_vendor = "apple",
13781383
))]
13791384
pub fn try_lock(&self) -> Result<(), TryLockError> {
@@ -1415,6 +1420,7 @@ impl File {
14151420
target_os = "cygwin",
14161421
target_os = "solaris",
14171422
target_os = "illumos",
1423+
target_os = "aix",
14181424
target_vendor = "apple",
14191425
)))]
14201426
pub fn try_lock(&self) -> Result<(), TryLockError> {
@@ -1432,6 +1438,7 @@ impl File {
14321438
target_os = "openbsd",
14331439
target_os = "cygwin",
14341440
target_os = "illumos",
1441+
target_os = "aix",
14351442
target_vendor = "apple",
14361443
))]
14371444
pub fn try_lock_shared(&self) -> Result<(), TryLockError> {
@@ -1473,6 +1480,7 @@ impl File {
14731480
target_os = "cygwin",
14741481
target_os = "solaris",
14751482
target_os = "illumos",
1483+
target_os = "aix",
14761484
target_vendor = "apple",
14771485
)))]
14781486
pub fn try_lock_shared(&self) -> Result<(), TryLockError> {
@@ -1490,6 +1498,7 @@ impl File {
14901498
target_os = "openbsd",
14911499
target_os = "cygwin",
14921500
target_os = "illumos",
1501+
target_os = "aix",
14931502
target_vendor = "apple",
14941503
))]
14951504
pub fn unlock(&self) -> io::Result<()> {
@@ -1515,6 +1524,7 @@ impl File {
15151524
target_os = "cygwin",
15161525
target_os = "solaris",
15171526
target_os = "illumos",
1527+
target_os = "aix",
15181528
target_vendor = "apple",
15191529
)))]
15201530
pub fn unlock(&self) -> io::Result<()> {

0 commit comments

Comments
 (0)