WIP: image processing library (or libraries?) #12
1 changed files with 10 additions and 5 deletions
|
@ -14,11 +14,16 @@ pub struct Config {
|
|||
impl Config {
|
||||
/// Get the configs from all possible places (args, file, env...)
|
||||
pub fn read(args: &CliConfigs) -> Self {
|
||||
let config = if let Some(config) = &args.config_path {
|
||||
Ok(config.clone())
|
||||
} else {
|
||||
find_config_file()
|
||||
};
|
||||
// let config = if let Some(config) = &args.config_path {
|
||||
schrottkatze marked this conversation as resolved
Outdated
|
||||
// Ok(config.clone())
|
||||
// } else {
|
||||
// find_config_file()
|
||||
// };
|
||||
let config = args
|
||||
.config_path
|
||||
.clone()
|
||||
.ok_or(())
|
||||
.or_else(|()| find_config_file());
|
||||
|
||||
// try to read a maybe existing config file
|
||||
let config = config.ok().and_then(|path| {
|
||||
|
|
Loading…
Reference in a new issue
Could use
Option::ok_or
withResult::or_else
(untested):Doesn't work since
find_config_file
returns an owned value and the other value is unowned, if i add.as_ref()
to thefind_config_file
call, it doesn't work either since then it's a temporary value.Then how about cloning it instead?
Works.