diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
commit | 9835e2ae736235810b4ea1c162ca5e65c547e770 (patch) | |
tree | 3fcebf40ed70e581d776a8a4c65923e8ec20e026 /vendor/rustix/src/fs/mod.rs | |
parent | Releasing progress-linux version 1.70.0+dfsg2-1~progress7.99u1. (diff) | |
download | rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.tar.xz rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.zip |
Merging upstream version 1.71.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/rustix/src/fs/mod.rs')
-rw-r--r-- | vendor/rustix/src/fs/mod.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/vendor/rustix/src/fs/mod.rs b/vendor/rustix/src/fs/mod.rs index 9588cebe0..e28ddab6f 100644 --- a/vendor/rustix/src/fs/mod.rs +++ b/vendor/rustix/src/fs/mod.rs @@ -42,9 +42,10 @@ mod raw_dir; mod sendfile; #[cfg(any(target_os = "android", target_os = "linux"))] mod statx; -// TODO: Enable `sync` for solarish when upstream is updated. -#[cfg(not(any(solarish, target_os = "redox", target_os = "wasi")))] +#[cfg(not(any(target_os = "redox", target_os = "wasi")))] mod sync; +#[cfg(any(apple, target_os = "android", target_os = "linux"))] +mod xattr; #[cfg(any(target_os = "android", target_os = "linux"))] pub use crate::backend::fs::inotify; @@ -90,13 +91,15 @@ pub use raw_dir::{RawDir, RawDirEntry}; pub use sendfile::sendfile; #[cfg(any(target_os = "android", target_os = "linux"))] pub use statx::{statx, Statx, StatxFlags, StatxTimestamp}; -#[cfg(not(any(solarish, target_os = "redox", target_os = "wasi")))] +#[cfg(not(any(target_os = "redox", target_os = "wasi")))] pub use sync::sync; +#[cfg(any(apple, target_os = "android", target_os = "linux"))] +pub use xattr::*; /// Re-export types common to POSIX-ish platforms. #[cfg(feature = "std")] #[cfg(unix)] pub use std::os::unix::fs::{DirEntryExt, FileExt, FileTypeExt, MetadataExt, OpenOptionsExt}; #[cfg(feature = "std")] -#[cfg(target_os = "wasi")] +#[cfg(all(wasi_ext, target_os = "wasi"))] pub use std::os::wasi::fs::{DirEntryExt, FileExt, FileTypeExt, MetadataExt, OpenOptionsExt}; |