mirror of
https://github.com/MedzikUser/HomeDisk.git
synced 2024-08-14 21:46:53 +00:00
types (macros): use .ok_or(...)
in option_return
macro
This commit is contained in:
parent
e3a8bf3550
commit
99f0623f1f
2 changed files with 3 additions and 9 deletions
|
@ -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());
|
||||
|
||||
|
|
|
@ -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))
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue