ari-party/rojo
1
0
Fork 0
forked from rojo-rbx/rojo
Code Pull Requests Activity

Clean up Vfs methods that defer to VfsLock

Browse Source
This commit is contained in:
Lucien Greathouse
2020-02-19 09:17:21 -08:00
parent 52e1dbd846
commit 339e1060b7
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vfs/src/lib.rs
View File

@@ -133,8 +133,7 @@ impl Vfs {
/// [std::fs::read]: https://doc.rust-lang.org/stable/std/fs/fn.read.html
pub fn read<P: AsRef<Path>>(&self, path: P) -> io::Result<Arc<Vec<u8>>> {
let path = path.as_ref();
let mut inner = self.inner.lock().unwrap();
inner.read(path)
self.inner.lock().unwrap().read(path)
}
/// Write a file to the VFS and the underlying backend.
@@ -145,8 +144,7 @@ impl Vfs {
pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(&self, path: P, contents: C) -> io::Result<()> {
let path = path.as_ref();
let contents = contents.as_ref();
let mut inner = self.inner.lock().unwrap();
inner.write(path, contents)
self.inner.lock().unwrap().write(path, contents)
}
/// Read all of the children of a directory.
@@ -156,7 +154,6 @@ impl Vfs {
/// [std::fs::read_dir]: https://doc.rust-lang.org/stable/std/fs/fn.read_dir.html
pub fn read_dir<P: AsRef<Path>>(&self, path: P) -> io::Result<ReadDir> {
let path = path.as_ref();
let mut inner = self.inner.lock().unwrap();
inner.read_dir(path)
self.inner.lock().unwrap().read_dir(path)
}
}