s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

syntax: Let older rustc understand symbolmap's lifetime

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-10-01 14:12:15 +00:00
parent 2959d27ea3
commit c686cf7e81
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/data.rs
View File

@ -386,7 +386,8 @@ impl Layout {
extract_symbol_names(&button_actions) extract_symbol_names(&button_actions)
); );
let button_states = button_actions.into_iter().map(|(name, action)| { let button_states = HashMap::<String, KeyState>::from_iter(
button_actions.into_iter().map(|(name, action)| {
let keycodes = match &action { let keycodes = match &action {
::action::Action::Submit { text: _, keys } => { ::action::Action::Submit { text: _, keys } => {
keys.iter().map(|named_keysym| { keys.iter().map(|named_keysym| {
@ -414,10 +415,7 @@ impl Layout {
action, action,
} }
) )
}); })
let button_states = HashMap::<String, KeyState>::from_iter(
button_states
); );
let keymap_str = match generate_keymap(symbolmap) { let keymap_str = match generate_keymap(symbolmap) {