diff options
| author | bors <bors@rust-lang.org> | 2025-04-19 16:03:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-19 16:03:34 +0000 |
| commit | 077cedc2afa8ac0b727b7a6cbe012940ba228deb (patch) | |
| tree | 8071bf6a1c05c6114d729698a9b9fc25d60d921e /library/std/src/sys/fs/unix.rs | |
| parent | a7c39b68616668a45f0afd62849a1da7c8ad2516 (diff) | |
| parent | 9ebc73e2b62cfd2c678b84bfad9e6cf86a315a97 (diff) | |
| download | rust-077cedc2afa8ac0b727b7a6cbe012940ba228deb.tar.gz rust-077cedc2afa8ac0b727b7a6cbe012940ba228deb.zip | |
Auto merge of #140040 - ChrisDenton:rollup-56bzfuq, r=ChrisDenton
Rollup of 8 pull requests Successful merges: - #137454 (not lint break with label and unsafe block) - #139297 (Deduplicate & clean up Nix shell) - #139535 (Implement `Default` for raw pointers) - #139919 (Make rustdoc JSON Span column 1-based, just like line numbers) - #139922 (fix incorrect type in cstr `to_string_lossy()` docs) - #140007 (Disable has_thread_local on i686-win7-windows-msvc) - #140016 (std: Use fstatat() on illumos) - #140025 (Re-remove `AdtFlags::IS_ANONYMOUS`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/fs/unix.rs')
| -rw-r--r-- | library/std/src/sys/fs/unix.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/library/std/src/sys/fs/unix.rs b/library/std/src/sys/fs/unix.rs index 687fc322e59..bc8817bac70 100644 --- a/library/std/src/sys/fs/unix.rs +++ b/library/std/src/sys/fs/unix.rs @@ -12,10 +12,11 @@ use libc::c_char; all(target_os = "linux", not(target_env = "musl")), target_os = "android", target_os = "fuchsia", - target_os = "hurd" + target_os = "hurd", + target_os = "illumos", ))] use libc::dirfd; -#[cfg(target_os = "fuchsia")] +#[cfg(any(target_os = "fuchsia", target_os = "illumos"))] use libc::fstatat as fstatat64; #[cfg(any(all(target_os = "linux", not(target_env = "musl")), target_os = "hurd"))] use libc::fstatat64; @@ -892,7 +893,8 @@ impl DirEntry { all(target_os = "linux", not(target_env = "musl")), target_os = "android", target_os = "fuchsia", - target_os = "hurd" + target_os = "hurd", + target_os = "illumos", ), not(miri) // no dirfd on Miri ))] @@ -922,6 +924,7 @@ impl DirEntry { target_os = "android", target_os = "fuchsia", target_os = "hurd", + target_os = "illumos", )), miri ))] |