matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Remove unwrap() calling by matching

Browse source
This commit is contained in:
Matthias Beyer 2016-05-14 19:47:34 +02:00
parent 11021906b3
commit 7b855f82f3
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libimagrt/src/runtime.rs
View file

@ -70,25 +70,21 @@ impl<'a> Runtime<'a> {
spath spath
}, PathBuf::from); }, PathBuf::from);
let cfg = Configuration::new(&rtp); let cfg = match Configuration::new(&rtp) {
let cfg = if cfg.is_err() { Err(e) => if e.err_type() != ConfigErrorKind::NoConfigFileFound {
let e = cfg.unwrap_err();
if e.err_type() != ConfigErrorKind::NoConfigFileFound {
let cause : Option<Box<Error>> = Some(Box::new(e)); let cause : Option<Box<Error>> = Some(Box::new(e));
return Err(RuntimeError::new(RuntimeErrorKind::Instantiate, cause)); return Err(RuntimeError::new(RuntimeErrorKind::Instantiate, cause));
} else { } else {
trace_error(&e); trace_error(&e);
None None
} },
} else {
Some(cfg.unwrap()) Ok(cfg) => Some(cfg),
}; };
let store_config = { let store_config = match cfg {
match cfg {
Some(ref c) => c.store_config().cloned(), Some(ref c) => c.store_config().cloned(),
None => None, None => None,
}
}; };
if is_debugging { if is_debugging {