fixup! feat: remove mutability from the WasiCtx Table

Signed-off-by: Harald Hoyer <harald@profian.com>

Author: haraldh

crates/wasi-common/src/dir.rs

@@ -2,6 +2,7 @@ use crate::file::{FdFlags, FileCaps, FileType, Filestat, OFlags, WasiFile};
 use crate::{Error, ErrorExt, SystemTimeSpec};
 use bitflags::bitflags;
 use std::any::Any;
+use std::ops::Deref;
 use std::path::PathBuf;
 use std::sync::{Arc, RwLock};
 
@@ -121,37 +122,48 @@ impl DirEntry {
         }
     }
     pub fn capable_of_dir(&self, caps: DirCaps) -> Result<(), Error> {
-        if self.caps.read().unwrap().dir_caps.contains(caps) {
+        let fdstat = self.caps.read().unwrap();
+        Self::locked_capable_of_dir(&fdstat, caps)
+    }
+    fn locked_capable_of_dir(
+        fdstat: &impl Deref<Target = DirFdStat>,
+        caps: DirCaps,
+    ) -> Result<(), Error> {
+        let fdstat = fdstat.deref();
+        if fdstat.dir_caps.contains(caps) {
             Ok(())
         } else {
-            let missing = caps & !self.caps.read().unwrap().dir_caps;
+            let missing = caps & !fdstat.dir_caps;
             let err = if missing.intersects(DirCaps::READDIR) {
                 Error::not_dir()
             } else {
                 Error::perm()
             };
             Err(err.context(format!(
                 "desired rights {:?}, has {:?}",
-                caps,
-                self.caps.read().unwrap().dir_caps
+                caps, fdstat.dir_caps
             )))
         }
     }
-    pub fn capable_of_file(&self, caps: FileCaps) -> Result<(), Error> {
-        if self.caps.read().unwrap().file_caps.contains(caps) {
+    fn locked_capable_of_file(
+        fdstat: &impl Deref<Target = DirFdStat>,
+        caps: FileCaps,
+    ) -> Result<(), Error> {
+        let fdstat = fdstat.deref();
+        if fdstat.file_caps.contains(caps) {
             Ok(())
         } else {
             Err(Error::perm().context(format!(
                 "desired rights {:?}, has {:?}",
-                caps,
-                self.caps.read().unwrap().file_caps
+                caps, fdstat.file_caps
             )))
         }
     }
     pub fn drop_caps_to(&self, dir_caps: DirCaps, file_caps: FileCaps) -> Result<(), Error> {
-        self.capable_of_dir(dir_caps)?;
-        self.capable_of_file(file_caps)?;
-        *self.caps.write().unwrap() = DirFdStat {
+        let mut fdstat = self.caps.write().unwrap();
+        Self::locked_capable_of_dir(&fdstat, dir_caps)?;
+        Self::locked_capable_of_file(&fdstat, file_caps)?;
+        *fdstat = DirFdStat {
             dir_caps,
             file_caps,
         };