diff --git a/lib/runtime-abi/src/vfs/file_like.rs b/lib/runtime-abi/src/vfs/file_like.rs index 36c734ce3..4b9b8771c 100644 --- a/lib/runtime-abi/src/vfs/file_like.rs +++ b/lib/runtime-abi/src/vfs/file_like.rs @@ -11,12 +11,11 @@ pub trait FileLike: std::io::Write + std::io::Read + std::io::Seek { fn metadata(&self) -> Result; // write -// fn write_file(&mut self, buf: &[u8]) -> Result; + // fn write_file(&mut self, buf: &[u8]) -> Result; // read -// fn read_file(&mut self, buf: &mut [u8]) -> Result; + // fn read_file(&mut self, buf: &mut [u8]) -> Result; // set_file_len fn set_file_len(&mut self, len: usize) -> Result<(), failure::Error>; } - diff --git a/lib/runtime-abi/src/vfs/vfs.rs b/lib/runtime-abi/src/vfs/vfs.rs index bbdeee25f..5cb7a0997 100644 --- a/lib/runtime-abi/src/vfs/vfs.rs +++ b/lib/runtime-abi/src/vfs/vfs.rs @@ -1,5 +1,6 @@ use crate::vfs::file_like::FileLike; use crate::vfs::vfs_header::{header_from_bytes, ArchiveType, CompressionType}; +use crate::vfs::virtual_file::VirtualFile; use hashbrown::HashMap; use std::cell::RefCell; use std::io; @@ -8,7 +9,6 @@ use std::path::{Path, PathBuf}; use std::rc::Rc; use tar::EntryType; use zbox::{init_env, OpenOptions, Repo, RepoOpener}; -use crate::vfs::virtual_file::VirtualFile; pub struct Vfs { repo: Repo, diff --git a/lib/runtime-abi/src/vfs/virtual_file.rs b/lib/runtime-abi/src/vfs/virtual_file.rs index 097199350..cd72231a1 100644 --- a/lib/runtime-abi/src/vfs/virtual_file.rs +++ b/lib/runtime-abi/src/vfs/virtual_file.rs @@ -1,16 +1,19 @@ -use failure::Error; use crate::vfs::file_like::{FileLike, Metadata}; +use failure::Error; use std::io; pub struct VirtualFile(zbox::File); impl VirtualFile { - pub fn new(file: zbox::File) -> Self { VirtualFile(file) } + pub fn new(file: zbox::File) -> Self { + VirtualFile(file) + } } impl FileLike for VirtualFile { fn metadata(&self) -> Result { - self.0.metadata() + self.0 + .metadata() .map(|m| Metadata { len: m.content_len(), is_file: m.is_file(),