Delete DirOptions{,Ext}

Not used anywhere on `wasmtime-wasi`

Author: alexcrichton

crates/wasi/src/filesystem.rs

@@ -1,5 +1,5 @@
 use crate::clocks::Datetime;
-use crate::filesystem::primitives::{DirOptions, FollowSymlinks, Metadata, OpenOptions};
+use crate::filesystem::primitives::{FollowSymlinks, Metadata, OpenOptions};
 use crate::runtime::{AbortOnDropJoinHandle, spawn_blocking};
 use std::collections::hash_map;
 use std::sync::Arc;
@@ -853,10 +853,8 @@ impl Dir {
         if self.perms.write_not_permitted() {
             return Err(ErrorCode::NotPermitted);
         }
-        self.run_blocking(move |d| {
-            crate::filesystem::primitives::create_dir(d, path.as_ref(), &DirOptions::new())
-        })
-        .await?;
+        self.run_blocking(move |d| crate::filesystem::primitives::create_dir(d, path.as_ref()))
+            .await?;
         Ok(())
     }
 

crates/wasi/src/filesystem/primitives/dir_options.rs

@@ -21,7 +21,6 @@ use std::path::{Path, PathBuf};
 use std::{fs, io};
 
 mod dir_entry;
-mod dir_options;
 mod file_type;
 mod maybe_owned_file;
 mod metadata;
@@ -53,7 +52,6 @@ use sys::read_link_impl as read_link_contents;
 use sys::*;
 
 pub(crate) use dir_entry::DirEntry;
-pub(crate) use dir_options::DirOptions;
 pub(crate) use file_type::FileType;
 #[cfg(any(unix, target_os = "vxworks"))]
 pub(crate) use file_type::FileTypeExt;

crates/wasi/src/filesystem/primitives/mod.rs

@@ -1,19 +1,9 @@
-use crate::filesystem::primitives::DirOptions;
-use rustix::fs::{Mode, RawMode, mkdirat};
+use rustix::fs::{Mode, mkdirat};
 use std::path::Path;
 use std::{fs, io};
 
 /// *Unsandboxed* function similar to `create_dir`, but which does not perform
 /// sandboxing.
-pub(crate) fn create_dir_unchecked(
-    start: &fs::File,
-    path: &Path,
-    options: &DirOptions,
-) -> io::Result<()> {
-    #[cfg(not(target_os = "wasi"))]
-    let raw_mode = options.ext.mode as RawMode;
-    #[cfg(target_os = "wasi")]
-    let raw_mode = 0;
-
-    Ok(mkdirat(start, path, Mode::from_bits(raw_mode).unwrap())?)
+pub(crate) fn create_dir_unchecked(start: &fs::File, path: &Path) -> io::Result<()> {
+    Ok(mkdirat(start, path, Mode::empty())?)
 }

crates/wasi/src/filesystem/primitives/rustix/fs/create_dir_unchecked.rs

@@ -1,7 +1,5 @@
 mod create_dir_unchecked;
 mod dir_entry_inner;
-#[cfg(not(target_os = "wasi"))]
-mod dir_options_ext;
 mod dir_utils;
 mod file_type_ext;
 mod hard_link_unchecked;
@@ -60,8 +58,6 @@ pub(crate) use crate::filesystem::primitives::{
 
 pub(crate) use create_dir_unchecked::create_dir_unchecked;
 pub(crate) use dir_entry_inner::DirEntryInner;
-#[cfg(not(target_os = "wasi"))]
-pub(crate) use dir_options_ext::DirOptionsExt;
 pub(crate) use dir_utils::*;
 pub(crate) use file_type_ext::ImplFileTypeExt;
 pub(crate) use hard_link_unchecked::hard_link_unchecked;

crates/wasi/src/filesystem/primitives/rustix/fs/dir_options_ext.rs

@@ -1,13 +1,11 @@
 use super::open_parent;
-use crate::filesystem::primitives::{
-    DirOptions, MaybeOwnedFile, create_dir_unchecked, strip_dir_suffix,
-};
+use crate::filesystem::primitives::{MaybeOwnedFile, create_dir_unchecked, strip_dir_suffix};
 use std::path::Path;
 use std::{fs, io};
 
 /// Implement `create_dir` by `open`ing up the parent component of the path and
 /// then calling `create_dir_unchecked` on the last component.
-pub(crate) fn create_dir(start: &fs::File, path: &Path, options: &DirOptions) -> io::Result<()> {
+pub(crate) fn create_dir(start: &fs::File, path: &Path) -> io::Result<()> {
     let start = MaybeOwnedFile::borrowed(start);
 
     // As a special case, `create_dir` ignores a trailing slash rather than
@@ -17,5 +15,5 @@ pub(crate) fn create_dir(start: &fs::File, path: &Path, options: &DirOptions) ->
 
     let (dir, basename) = open_parent(start, &path)?;
 
-    create_dir_unchecked(&dir, basename.as_ref(), options)
+    create_dir_unchecked(&dir, basename.as_ref())
 }

crates/wasi/src/filesystem/primitives/rustix/fs/mod.rs

@@ -1,18 +1,11 @@
 use super::get_path::concatenate;
-use crate::filesystem::primitives::DirOptions;
 use std::path::Path;
 use std::{fs, io};
 
 /// *Unsandboxed* function similar to `create_dir`, but which does not perform
 /// sandboxing.
 ///
-/// Windows doesn't have any extra flags in `DirOptions`, so the `options`
-/// parameter is ignored.
-pub(crate) fn create_dir_unchecked(
-    start: &fs::File,
-    path: &Path,
-    _options: &DirOptions,
-) -> io::Result<()> {
+pub(crate) fn create_dir_unchecked(start: &fs::File, path: &Path) -> io::Result<()> {
     let out_path = concatenate(start, path)?;
     fs::create_dir(out_path)
 }

crates/wasi/src/filesystem/primitives/via_parent/create_dir.rs

@@ -1,7 +1,6 @@
 mod create_dir_unchecked;
 mod create_file_at_w;
 mod dir_entry_inner;
-mod dir_options_ext;
 mod dir_utils;
 mod file_type_ext;
 mod get_path;
@@ -37,7 +36,6 @@ pub(crate) use crate::filesystem::primitives::{
 
 pub(crate) use create_dir_unchecked::*;
 pub(crate) use dir_entry_inner::*;
-pub(crate) use dir_options_ext::*;
 pub(crate) use dir_utils::*;
 pub(crate) use file_type_ext::*;
 pub(crate) use hard_link_unchecked::*;