From 0e1aaccc99a76355be747036b5acdf17fdf47b5c Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Wed, 24 Sep 2025 13:39:12 -0700 Subject: [PATCH 1/2] vfs: fix directory async --- src/vfs/directory/directory_async.rs | 30 +++++++++++++--------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/vfs/directory/directory_async.rs b/src/vfs/directory/directory_async.rs index dd2e534..8195cd6 100644 --- a/src/vfs/directory/directory_async.rs +++ b/src/vfs/directory/directory_async.rs @@ -1,4 +1,4 @@ -use super::{parse_response, vfs_request, DirEntry, FileType, VfsAction, VfsError, VfsResponse}; +use super::{vfs_request, DirEntry, FileType, VfsAction, VfsError, VfsResponse}; use crate::hyperapp; pub struct DirectoryAsync { @@ -10,16 +10,16 @@ impl DirectoryAsync { pub async fn read(&self) -> Result, VfsError> { let request = vfs_request(&self.path, VfsAction::ReadDir).expects_response(self.timeout); - let resp_bytes = hyperapp::send_rmp::>(request) + let response = hyperapp::send::(request) .await .map_err(|_| VfsError::SendError(crate::SendErrorKind::Timeout))?; - match parse_response(&resp_bytes)? { + match response { VfsResponse::ReadDir(entries) => Ok(entries), VfsResponse::Err(e) => Err(e), _ => Err(VfsError::ParseError { error: "unexpected response".to_string(), - path: self.path.clone(), + path: self.path.to_string(), }), } } @@ -34,11 +34,11 @@ pub async fn open_dir_async( if !create { let request = vfs_request(path, VfsAction::Metadata).expects_response(timeout); - let resp_bytes = hyperapp::send_rmp::>(request) + let response = hyperapp::send::(request) .await .map_err(|_| VfsError::SendError(crate::SendErrorKind::Timeout))?; - match parse_response(&resp_bytes)? { + match response { VfsResponse::Metadata(m) => { if m.file_type != FileType::Directory { return Err(VfsError::IOError( @@ -47,12 +47,10 @@ pub async fn open_dir_async( } } VfsResponse::Err(e) => return Err(e), - _ => { - return Err(VfsError::ParseError { - error: "unexpected response".to_string(), - path: path.to_string(), - }) - } + _ => return Err(VfsError::ParseError { + error: "unexpected response".to_string(), + path: path.to_string(), + }), } return Ok(DirectoryAsync { @@ -63,11 +61,11 @@ pub async fn open_dir_async( let request = vfs_request(path, VfsAction::CreateDirAll).expects_response(timeout); - let resp_bytes = hyperapp::send_rmp::>(request) + let response = hyperapp::send::(request) .await .map_err(|_| VfsError::SendError(crate::SendErrorKind::Timeout))?; - match parse_response(&resp_bytes)? { + match response { VfsResponse::Ok => Ok(DirectoryAsync { path: path.to_string(), timeout, @@ -85,11 +83,11 @@ pub async fn remove_dir_async(path: &str, timeout: Option) -> Result<(), Vf let request = vfs_request(path, VfsAction::RemoveDir).expects_response(timeout); - let resp_bytes = hyperapp::send_rmp::>(request) + let response = hyperapp::send::(request) .await .map_err(|_| VfsError::SendError(crate::SendErrorKind::Timeout))?; - match parse_response(&resp_bytes)? { + match response { VfsResponse::Ok => Ok(()), VfsResponse::Err(e) => Err(e), _ => Err(VfsError::ParseError { From 820debd6fd625f7de226356fead62b61b9764fae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Sep 2025 20:39:38 +0000 Subject: [PATCH 2/2] Format Rust code using rustfmt --- src/vfs/directory/directory_async.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/vfs/directory/directory_async.rs b/src/vfs/directory/directory_async.rs index 8195cd6..16a65f8 100644 --- a/src/vfs/directory/directory_async.rs +++ b/src/vfs/directory/directory_async.rs @@ -47,10 +47,12 @@ pub async fn open_dir_async( } } VfsResponse::Err(e) => return Err(e), - _ => return Err(VfsError::ParseError { - error: "unexpected response".to_string(), - path: path.to_string(), - }), + _ => { + return Err(VfsError::ParseError { + error: "unexpected response".to_string(), + path: path.to_string(), + }) + } } return Ok(DirectoryAsync {