diff options
Diffstat (limited to 'lib/core/libimagrt')
| -rw-r--r-- | lib/core/libimagrt/src/runtime.rs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/core/libimagrt/src/runtime.rs b/lib/core/libimagrt/src/runtime.rs index 8844afe7..83876ec9 100644 --- a/lib/core/libimagrt/src/runtime.rs +++ b/lib/core/libimagrt/src/runtime.rs @@ -388,15 +388,17 @@ impl<'a> Runtime<'a> { self.cli() .value_of("editor") .map(String::from) - .or_else(|| { + .ok_or_else(|| { self.config() - .and_then(|v| match v.read("rt.editor") { - Ok(Some(&Value::String(ref s))) => Some(s.clone()), - _ => None, // FIXME silently ignore errors in config is bad + .ok_or_else(|| Error::from(err_msg("No Configuration!"))) + .and_then(|v| match v.read("rt.editor")? { + Some(&Value::String(ref s)) => Ok(Some(s.clone())), + Some(_) => Err(Error::from(err_msg("Type error at 'rt.editor', expected 'String'"))), + None => Ok(None), }) }) - .or(env::var("EDITOR").ok()) - .ok_or_else(|| Error::from(EM::IO)) + .or(env::var("EDITOR")) + .map_err(|_| Error::from(EM::IO)) .map_dbg(|s| format!("Editing with '{}'", s)) .and_then(|s| { let mut split = s.split_whitespace(); |