better error handlingrefactor

1 files changed, 6 insertions, 6 deletions

diff --git a/src/cache.rs b/src/cache.rs
index 6ffeb52..199a440 100644
--- a/src/cache.rs
+++ b/src/cache.rs
@@ -3,15 +3,15 @@ use std::{
     fs::{copy, read_dir},
 };
 
-use crate::error::{EType, MLErr, MLE};
+use crate::errors::{ConversionError, Error, MLE};
 
 /// # Errors
 pub fn get_cached_versions(path: &str) -> MLE<HashMap<String, String>> {
     let mut versions: HashMap<String, String> = HashMap::new();
-    for file in read_dir(path).map_err(|_| MLErr::new(EType::IoError, "readdir"))? {
-        let path = file.map_err(|_| MLErr::new(EType::IoError, "file"))?.path();
-        if path.is_file() && path.extension().ok_or(MLErr::new(EType::IoError, "ext"))? == "jar" {
-            let pathstr = path.to_str().ok_or(MLErr::new(EType::IoError, "path"))?;
+    for file in read_dir(path)? {
+        let path = file?.path();
+        if path.is_file() && path.extension().ok_or(Error::NoFileExtension)? == "jar" {
+            let pathstr = path.to_str().ok_or(ConversionError::InvalidPath)?;
             let namesplit: Vec<&str> = pathstr.split('.').collect();
             versions.insert(
                 String::from(namesplit[namesplit.len() - 2]),
@@ -27,6 +27,6 @@ pub fn copy_cached_version(version_path: &str, download_path: &str) -> MLE<()> {
     let versplit: Vec<&str> = version_path.split('/').collect();
     let download =
         format!("{}/{}", download_path, versplit[versplit.len() - 1]);
-    copy(version_path, download).map_err(|err| MLErr::new(EType::IoError, &err.to_string()))?;
+    copy(version_path, download)?;
     Ok(())
 }