More WASI support.

Author: sunfishcode

cap-primitives/src/posish/fs/c_str.rs

@@ -1,4 +1,8 @@
-use std::{ffi::CString, io, os::unix::ffi::OsStrExt, path::Path};
+#[cfg(unix)]
+use std::os::unix::ffi::OsStrExt;
+#[cfg(target_os = "wasi")]
+use std::os::wasi::ffi::OsStrExt;
+use std::{ffi::CString, io, path::Path};
 
 #[allow(dead_code)]
 pub(crate) fn c_str(path: &Path) -> io::Result<CString> {

cap-primitives/src/posish/fs/dir_entry_inner.rs

@@ -1,13 +1,14 @@
 use crate::fs::{FileType, FileTypeExt, Metadata, OpenOptions, ReadDir, ReadDirInner};
 use posish::fs::Entry;
 #[cfg(unix)]
+use std::os::unix::ffi::OsStrExt;
+#[cfg(unix)]
 use std::os::unix::fs::MetadataExt;
 #[cfg(target_os = "wasi")]
-use std::os::wasi::fs::MetadataExt;
+use std::os::wasi::{ffi::OsStrExt, fs::MetadataExt};
 use std::{
     ffi::{OsStr, OsString},
     fmt, fs, io,
-    os::unix::ffi::OsStrExt,
 };
 
 pub(crate) struct DirEntryInner {

cap-primitives/src/posish/fs/dir_utils.rs

@@ -1,10 +1,13 @@
 use crate::fs::OpenOptions;
 use posish::fs::OFlags;
+#[cfg(unix)]
+use std::os::unix::{ffi::OsStrExt, fs::OpenOptionsExt};
+#[cfg(target_os = "wasi")]
+use std::os::wasi::{ffi::OsStrExt, fs::OpenOptionsExt};
 use std::{
     ffi::OsStr,
     fs, io,
     ops::Deref,
-    os::unix::{ffi::OsStrExt, fs::OpenOptionsExt},
     path::{Component, Path},
 };
 #[cfg(racy_asserts)]

cap-primitives/src/posish/fs/read_dir_inner.rs

@@ -4,14 +4,20 @@ use crate::fs::{
     ReadDir,
 };
 use posish::fs::Dir;
+#[cfg(unix)]
+use std::os::unix::{
+    ffi::OsStrExt,
+    io::{AsRawFd, FromRawFd},
+};
+#[cfg(target_os = "wasi")]
+use std::os::wasi::{
+    ffi::OsStrExt,
+    io::{AsRawFd, FromRawFd},
+};
 use std::{
     ffi::OsStr,
     fmt, fs, io,
     mem::ManuallyDrop,
-    os::unix::{
-        ffi::OsStrExt,
-        io::{AsRawFd, FromRawFd},
-    },
     path::{Component, Path},
     sync::Arc,
 };