diff options
Diffstat (limited to 'src/utils.rs')
-rw-r--r-- | src/utils.rs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/utils.rs b/src/utils.rs index d1ffed8..fcac095 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1,22 +1,23 @@ use crate::error::{Error, PermissionType, Result}; use std::fs::File; use std::io::ErrorKind; -use std::path::PathBuf; +use std::path::Path; -pub fn open_file(filename: &PathBuf) -> Result<Option<File>> { +pub fn open_file(filename: &Path) -> Result<Option<File>> { File::open(filename).map(Some).or_else(|e| match e { e if e.kind() == ErrorKind::NotFound => Ok(None), - e if e.kind() == ErrorKind::PermissionDenied => { - Err(Error::Permissions(PermissionType::Read, filename.clone())) - } + e if e.kind() == ErrorKind::PermissionDenied => Err(Error::Permissions( + PermissionType::Read, + filename.to_path_buf(), + )), e => Err(Error::from(e)), }) } -pub fn create_file(filename: &PathBuf) -> Result<File> { +pub fn create_file(filename: &Path) -> Result<File> { File::create(filename).map_err(|e| { if e.kind() == ErrorKind::PermissionDenied { - Error::Permissions(PermissionType::Write, filename.clone()) + Error::Permissions(PermissionType::Write, filename.to_path_buf()) } else { Error::from(e) } |