diff options
author | Jiayi Zhao <jeff.no.zhao@gmail.com> | 2019-05-26 18:29:32 -0400 |
---|---|---|
committer | Jiayi Zhao <jeff.no.zhao@gmail.com> | 2019-05-26 18:30:14 -0400 |
commit | 0875ccf655ea30993cf84657ba44142f37e6b831 (patch) | |
tree | a445e4f10903e639946c731e1a3af41f0188d73a /src/config | |
parent | 829d8b9ff0806ffc2da692f12b9e8a6f5c228aa4 (diff) |
Revert keymaps back to vectors
- shell variables will no longer work in config
Diffstat (limited to 'src/config')
-rw-r--r-- | src/config/keymap.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/config/keymap.rs b/src/config/keymap.rs index 71ce9a8..1befdfe 100644 --- a/src/config/keymap.rs +++ b/src/config/keymap.rs @@ -18,7 +18,7 @@ struct JoshutoMapCommand { pub keys: Vec<i32>, pub command: String, #[serde(default)] - pub args: String, + pub args: Vec<String>, } #[derive(Debug, Deserialize)] @@ -31,7 +31,8 @@ impl Flattenable<JoshutoKeymap> for JoshutoRawKeymap { fn flatten(self) -> JoshutoKeymap { let mut keymaps = JoshutoKeymap::new(); self.mapcommand.iter().for_each(|m| { - match commands::from_args(m.command.as_str(), m.args.as_ref()) { + let args: Vec<&str> = m.args.iter().map(|s| s.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), } |