dir: Add convenience functions for accessing UTF-8 variants

cap-std/src/fs/dir.rs

@@ -1,6 +1,8 @@
 #[cfg(target_os = "wasi")]
 use crate::fs::OpenOptionsExt;
 use crate::fs::{DirBuilder, File, Metadata, OpenOptions, ReadDir};
+#[cfg(feature = "fs_utf8")]
+use crate::fs_utf8::Dir as DirUtf8;
 #[cfg(unix)]
 use crate::os::unix::net::{UnixDatagram, UnixListener, UnixStream};
 #[cfg(not(target_os = "wasi"))]
@@ -109,6 +111,16 @@ impl Dir {
         Ok(Self::from_std_file(dir))
     }
 
+    /// Attempts to open a directory, verifying UTF-8.
+    ///
+    /// This is equivalent to [`crate::fs_utf8::Dir::open_dir`].
+    #[inline]
+    #[cfg(feature = "fs_utf8")]
+    pub fn open_dir_utf8<P: AsRef<camino::Utf8Path>>(&self, path: P) -> io::Result<DirUtf8> {
+        let path = crate::fs_utf8::from_utf8(path.as_ref())?;
+        self.open_dir(path).map(DirUtf8::from_cap_std)
+    }
+
     /// Creates a new, empty directory at the provided path.
     ///
     /// This corresponds to [`std::fs::create_dir`], but only accesses paths
@@ -261,6 +273,15 @@ impl Dir {
         read_base_dir(&self.std_file).map(|inner| ReadDir { inner })
     }
 
+    /// Returns an iterator over UTF-8 entries within `self`.
+    ///
+    /// Equivalent to [`crate::fs_utf8::Dir::read_dir`].
+    #[inline]
+    #[cfg(feature = "fs_utf8")]
+    pub fn entries_utf8(&self) -> io::Result<crate::fs_utf8::ReadDir> {
+        self.entries().map(crate::fs_utf8::ReadDir::from_cap_std)
+    }
+
     /// Returns an iterator over the entries within a directory.
     ///
     /// This corresponds to [`std::fs::read_dir`], but only accesses paths

cap-std/src/fs_utf8/mod.rs

@@ -38,12 +38,12 @@ pub use camino;
 use camino::{Utf8Path, Utf8PathBuf};
 
 #[cfg(not(feature = "arf_strings"))]
-fn from_utf8<'a>(path: &'a Utf8Path) -> std::io::Result<&'a std::path::Path> {
+pub(crate) fn from_utf8<'a>(path: &'a Utf8Path) -> std::io::Result<&'a std::path::Path> {
     Ok(path.as_std_path())
 }
 
 #[cfg(feature = "arf_strings")]
-fn from_utf8<'a>(path: &'a Utf8Path) -> std::io::Result<std::path::PathBuf> {
+pub(crate) fn from_utf8<'a>(path: &'a Utf8Path) -> std::io::Result<std::path::PathBuf> {
     #[cfg(not(windows))]
     let path = {
         #[cfg(unix)]

tests/fs_utf8.rs

@@ -1680,3 +1680,16 @@ fn test_invalid_utf8() {
         }
     }
 }
+
+#[test]
+fn from_cap_std() {
+    let tmpdir = sys_common::io::tmpdir();
+    let dir = "d1/d2";
+    check!(tmpdir.create_dir_all(dir));
+    let d1_entry = tmpdir.entries_utf8().unwrap().next().unwrap().unwrap();
+    assert_eq!(d1_entry.file_name().unwrap(), "d1");
+
+    let d1 = tmpdir.open_dir_utf8("d1").unwrap();
+    let d2_entry = d1.entries().unwrap().next().unwrap().unwrap();
+    assert_eq!(d2_entry.file_name().unwrap(), "d2");
+}