diff options
author | Jiayi Zhao <jeff.no.zhao@gmail.com> | 2018-12-23 17:13:26 -0500 |
---|---|---|
committer | Jiayi Zhao <jeff.no.zhao@gmail.com> | 2018-12-23 17:13:26 -0500 |
commit | 27f32eb2c4a0297ca6a8d7928e898f996f4c8338 (patch) | |
tree | 8a0034b7aa4959f8d83ac14c6ddc7e16ac293832 /src/main.rs | |
parent | bace975a6ba24e46eea04ebe86fbb97e15e0bc04 (diff) |
add support for keymaps
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main.rs b/src/main.rs index 74670cf..4749e09 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,6 +6,7 @@ extern crate xdg; // use std::collections::BTreeMap; use std::env; use std::fs; +use std::process; mod joshuto; @@ -23,12 +24,11 @@ fn read_config() -> Option<joshuto::config::JoshutoRawConfig> Ok(config_contents) => { match toml::from_str(&config_contents) { Ok(config) => { - println!("rawconfig:\n{:?}", config); Some(config) }, Err(e) => { eprintln!("{}", e); - None + process::exit(1); }, } }, @@ -61,12 +61,11 @@ fn read_keymaps() -> Option<joshuto::keymap::JoshutoRawKeymaps> Ok(config_contents) => { match toml::from_str(&config_contents) { Ok(config) => { - println!("rawconfig:\n{:?}", config); Some(config) }, Err(e) => { eprintln!("{}", e); - None + process::exit(1); }, } }, @@ -100,5 +99,5 @@ fn main() let keymap = get_keymap(); println!("keymap:\n{:#?}", keymap); - joshuto::run(config); + joshuto::run(config, keymap); } |