diff --git a/src/fs/dir.rs b/src/fs/dir.rs index 77c068f..377a2b2 100644 --- a/src/fs/dir.rs +++ b/src/fs/dir.rs @@ -2,8 +2,7 @@ use crate::fs::{DirItem, DirItemIterator, Result}; use super::{ - path::{DirMarker, PathReal}, - DirHandle, Error, FileMarker, PathMarker, + path::{DirMarker, PathReal}, DirHandle, Error, FileHandle, FileMarker, PathHandle, PathMarker }; impl<'base, 'path> DirHandle<'base, 'path> { @@ -62,13 +61,11 @@ impl<'base, 'path> DirHandle<'base, 'path> { Ok(Box::new(DirItemIterator::new(read_dir))) } } -impl<'base, 'path> TryFrom> - for PathReal<'base, 'path, FileMarker> -{ +impl<'base, 'path> TryFrom> for FileHandle<'base, 'path> { type Error = crate::fs::Error; fn try_from( - path: PathReal<'base, 'path, PathMarker>, + path: PathHandle<'base, 'path>, ) -> std::result::Result { match path.as_file() { Ok(Some(dir)) => Ok(dir.clone()), @@ -79,13 +76,11 @@ impl<'base, 'path> TryFrom> } } } -impl<'base, 'path> TryFrom> - for PathReal<'base, 'path, DirMarker> -{ +impl<'base, 'path> TryFrom> for DirHandle<'base, 'path> { type Error = crate::fs::Error; fn try_from( - path: PathReal<'base, 'path, PathMarker>, + path: PathHandle<'base, 'path>, ) -> std::result::Result { match path.as_dir() { Ok(Some(dir)) => Ok(dir.clone()), diff --git a/src/fs/file.rs b/src/fs/file.rs index 9c8b7e4..9f55e62 100644 --- a/src/fs/file.rs +++ b/src/fs/file.rs @@ -58,7 +58,7 @@ impl<'base, 'path> FileHandle<'base, 'path> { /// # Ok(()) /// # } /// ``` - pub fn copy(&self, dest: &PathReal<'base, 'path, FileMarker>) -> Result { + pub fn copy(&self, dest: &FileHandle<'base, 'path>) -> Result { self.check_error()?; std::fs::copy(self.as_pathbuf(), dest.as_pathbuf()).map_err(Error::Io) } diff --git a/src/fs/path.rs b/src/fs/path.rs index 50169d5..2e4e529 100644 --- a/src/fs/path.rs +++ b/src/fs/path.rs @@ -6,6 +6,8 @@ use std::{ use crate::fs::{Error, Result}; +use super::{DirHandle, FileHandle, PathHandle}; + /// Marker trait for the type of [PathReal]. pub trait PathType {} @@ -170,7 +172,7 @@ impl<'base, 'path, T: PathType> PathReal<'base, 'path, T> { /// # Ok(()) /// # } /// ``` - pub fn as_dir(&self) -> Result>> { + pub fn as_dir(&self) -> Result>> { self.check_error()?; if self.as_pathbuf().is_dir() { Ok(Some(PathReal::new(self.base, self.path))) @@ -193,7 +195,7 @@ impl<'base, 'path, T: PathType> PathReal<'base, 'path, T> { /// # Ok(()) /// # } /// ``` - pub fn as_file(&self) -> Result>> { + pub fn as_file(&self) -> Result>> { self.check_error()?; if self.as_pathbuf().is_file() { Ok(Some(PathReal::new(self.base, self.path))) @@ -202,7 +204,7 @@ impl<'base, 'path, T: PathType> PathReal<'base, 'path, T> { } } } -impl From> for PathBuf { +impl<'base, 'path> From> for PathBuf { fn from(path: PathReal) -> Self { path.base.join(path.path) }