sos-vfs: Use Arc<RwLock> for root dir, fix rename() bug, add test spec. (#763)

* Use Arc<RwLock> for root dir, fix rename() bug, add test spec.

* Fix clippy warnings.

* Formatting.

* Clippy fixes.

* Bump version.

* Bump version for sos-vfs.

* Update crossbeam-channel for advisory.

* Update tokio for advisory.

Author: tmpfs

Cargo.lock

@@ -82,7 +82,7 @@ sos-preferences = { version = "0.17", path = "crates/preferences" }
 sos-signer = { version = "0.17", path = "crates/signer" }
 sos-sync = { version = "0.17", path = "crates/sync" }
 sos-sdk = { version = "0.17", path = "crates/sdk" }
-sos-vfs = { version = "0.2", path = "crates/vfs" }
+sos-vfs = { version = "0.3", path = "crates/vfs" }
 sos-web = { version = "0.17", path = "crates/web" }
 sos-vault = { version = "0.17", path = "crates/vault" }
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sos-vfs"
-version = "0.2.6"
+version = "0.3.0"
 edition = "2021"
 description = "Virtual file system same as tokio::fs."
 homepage = "https://saveoursecrets.com"

crates/vfs/Cargo.toml

@@ -1,3 +1,4 @@
+#![allow(clippy::len_without_is_empty)]
 //! Virtual file system.
 //!
 //! The API is designed to match the `tokio::fs` module which in

crates/vfs/src/lib.rs

@@ -6,7 +6,7 @@ use std::{
 };
 
 use super::fs::{
-    has_parent, resolve, resolve_parent, root_fs_mut, MemoryFd, Parent,
+    has_parent, resolve, resolve_parent, root_fs, MemoryFd, Parent,
     PathTarget,
 };
 
@@ -53,7 +53,7 @@ impl DirBuilder {
     /// * Other I/O error occurred.
     pub async fn create(&self, path: impl AsRef<Path>) -> Result<()> {
         if self.recursive {
-            let mut current = Parent::Root(root_fs_mut());
+            let mut current = Parent::Root(root_fs());
             let mut buf = PathBuf::new();
             #[allow(unused_assignments)]
             let mut file_name: Option<OsString> = None;
@@ -137,9 +137,7 @@ impl DirBuilder {
                     Err(ErrorKind::NotFound.into())
                 }
             } else {
-                Parent::Root(root_fs_mut())
-                    .mkdir(file_name.to_owned())
-                    .await?;
+                Parent::Root(root_fs()).mkdir(file_name.to_owned()).await?;
                 Ok(())
             }
         }

crates/vfs/src/memory/dir_builder.rs

@@ -98,17 +98,17 @@ enum Operation {
 impl File {
     /// Attempts to open a file in read-only mode.
     pub async fn open(path: impl AsRef<Path>) -> io::Result<File> {
-        Ok(OpenOptions::new().read(true).open(path).await?)
+        OpenOptions::new().read(true).open(path).await
     }
 
     /// Opens a file in write-only mode.
     pub async fn create(path: impl AsRef<Path>) -> io::Result<File> {
-        Ok(OpenOptions::new()
+        OpenOptions::new()
             .write(true)
             .create(true)
             .truncate(true)
             .open(path)
-            .await?)
+            .await
     }
 
     /// Attempts to sync all OS-internal metadata to disk.
@@ -167,13 +167,12 @@ impl File {
             };
 
             let res = if let Some(seek) = seek {
-                std.seek(seek).and_then(|_| {
+                std.seek(seek).map(|_| {
                     if let Some(zero) = extension {
                         std.get_mut().extend(zero.iter());
                     } else {
                         std.get_mut().truncate(size as usize);
                     }
-                    Ok(())
                 })
             } else {
                 if let Some(zero) = extension {