From 65f0f33a564d91bd8126ce684c02f245e5ea9a1f Mon Sep 17 00:00:00 2001 From: Jiayi Zhao Date: Sat, 29 Jun 2019 22:19:47 -0400 Subject: rework error system - JoshutoErrorKind now envelops all possible errors by Joshuto - JoshutoError behaves like std::io::Error - add JoshutoResult --- src/config/keymap.rs | 2 +- src/config/mimetype.rs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/config') diff --git a/src/config/keymap.rs b/src/config/keymap.rs index 7bce940..f711409 100644 --- a/src/config/keymap.rs +++ b/src/config/keymap.rs @@ -148,7 +148,7 @@ impl Flattenable for JoshutoRawCommandMapping { let args: Vec<&str> = m.args.iter().map(String::as_str).collect(); match commands::from_args(m.command.as_str(), &args) { Ok(command) => insert_keycommand(&mut keymaps, command, &m.keys[..]), - Err(e) => eprintln!("{}", e), + Err(e) => eprintln!("{}", e.cause()), } }); keymaps diff --git a/src/config/mimetype.rs b/src/config/mimetype.rs index 567dc2d..c36e812 100644 --- a/src/config/mimetype.rs +++ b/src/config/mimetype.rs @@ -46,7 +46,9 @@ impl JoshutoMimetypeEntry { impl std::fmt::Display for JoshutoMimetypeEntry { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.write_str(self.get_command()).unwrap(); - self.get_args().iter().for_each(|arg| write!(f, " {}", arg).unwrap()); + self.get_args() + .iter() + .for_each(|arg| write!(f, " {}", arg).unwrap()); f.write_str("\t[").unwrap(); if self.get_fork() { -- cgit v1.2.3