types (macros): use `.ok_or(...)` in `option_return` macro

types/src/config/toml.rs

@@ -10,7 +10,7 @@ impl Config {
     /// parse configuration file
     pub fn parse() -> Result<Config> {
         // configuration file path
-        let config_dir = option_return!(dirs::config_dir(), "s")?;
+        let config_dir = option_return!(dirs::config_dir(), "get config dir")?;
 
         let config_path = format!("{}/homedisk/config.toml", config_dir.to_string_lossy());
 

types/src/macros.rs

@@ -1,12 +1,6 @@
 #[macro_export]
 macro_rules! option_return {
-    ($a:expr,$b:expr) => {
+    ($variable:expr,$err_desc:expr) => {
-        match $a {
+        $variable.ok_or(std::io::Error::new(std::io::ErrorKind::Other, $err_desc))
-            Some(x) => Ok(x),
-            None => {
-                let err = std::io::Error::new(std::io::ErrorKind::Other, $b);
-                Err(anyhow::Error::from(err))
-            }
-        }
     };
 }