summaryrefslogtreecommitdiffstats
path: root/src/config
diff options
context:
space:
mode:
authorJiayi Zhao <jeff.no.zhao@gmail.com>2019-06-29 22:19:47 -0400
committerJiayi Zhao <jeff.no.zhao@gmail.com>2019-06-29 22:23:31 -0400
commit65f0f33a564d91bd8126ce684c02f245e5ea9a1f (patch)
treebc9bb5d877cee131dc7870c5f9f5d0c71898efbd /src/config
parent58f6428e2aead58b7f930008b294ce56df59e3cb (diff)
rework error system
- JoshutoErrorKind now envelops all possible errors by Joshuto - JoshutoError behaves like std::io::Error - add JoshutoResult
Diffstat (limited to 'src/config')
-rw-r--r--src/config/keymap.rs2
-rw-r--r--src/config/mimetype.rs4
2 files changed, 4 insertions, 2 deletions
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<JoshutoCommandMapping> 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() {