vfs: remove create_or_open helpers, use CreateDirAll in open_dir instead of CreateDir

Author: barraguda

src/vfs/directory.rs

@@ -67,7 +67,7 @@ pub fn open_dir(path: &str, create: bool, timeout: Option<u64>) -> Result<Direct
         });
     }
 
-    let message = vfs_request(path, VfsAction::CreateDir)
+    let message = vfs_request(path, VfsAction::CreateDirAll)
         .send_and_await_response(timeout)
         .unwrap()
         .map_err(|e| VfsError::IOError {
@@ -88,17 +88,6 @@ pub fn open_dir(path: &str, create: bool, timeout: Option<u64>) -> Result<Direct
     }
 }
 
-/// Open or create a directory at path.
-pub fn open_or_create_dir(path: &str) -> Result<Directory, VfsError> {
-    match open_dir(path, false, None) {
-        Ok(dir) => Ok(dir),
-        Err(_) => match open_dir(path, true, None) {
-            Ok(dir) => Ok(dir),
-            Err(e) => Err(e),
-        },
-    }
-}
-
 /// Removes a dir at path, errors if path not found or path is not a directory.
 pub fn remove_dir(path: &str, timeout: Option<u64>) -> Result<(), VfsError> {
     let timeout = timeout.unwrap_or(5);

src/vfs/file.rs

@@ -377,17 +377,6 @@ pub fn open_file(path: &str, create: bool, timeout: Option<u64>) -> Result<File,
     }
 }
 
-/// Open or create a file at path.
-pub fn open_or_create_file(path: &str) -> Result<File, VfsError> {
-    match open_file(path, false, None) {
-        Ok(file) => Ok(file),
-        Err(_) => match open_file(path, true, None) {
-            Ok(file) => Ok(file),
-            Err(e) => Err(e),
-        },
-    }
-}
-
 /// Creates a file at path, if file found at path, truncates it to 0.
 pub fn create_file(path: &str, timeout: Option<u64>) -> Result<File, VfsError> {
     let timeout = timeout.unwrap_or(5);