From 99f0623f1f4b6eef6bcc4b074f189e559bb1bef9 Mon Sep 17 00:00:00 2001
From: MedzikUser <nivua1fn@duck.com>
Date: Tue, 19 Apr 2022 21:18:45 +0200
Subject: [PATCH] types (macros): use `.ok_or(...)` in `option_return` macro

---
 types/src/config/toml.rs |  2 +-
 types/src/macros.rs      | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/types/src/config/toml.rs b/types/src/config/toml.rs
index ce9ba0d..8f10439 100644
--- a/types/src/config/toml.rs
+++ b/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());
 
diff --git a/types/src/macros.rs b/types/src/macros.rs
index b50c508..3d20e4b 100644
--- a/types/src/macros.rs
+++ b/types/src/macros.rs
@@ -1,12 +1,6 @@
 #[macro_export]
 macro_rules! option_return {
-    ($a:expr,$b:expr) => {
-        match $a {
-            Some(x) => Ok(x),
-            None => {
-                let err = std::io::Error::new(std::io::ErrorKind::Other, $b);
-                Err(anyhow::Error::from(err))
-            }
-        }
+    ($variable:expr,$err_desc:expr) => {
+        $variable.ok_or(std::io::Error::new(std::io::ErrorKind::Other, $err_desc))
     };
 }