Merge branch 'errors' into 'master'

rust: Fix compiler warnings

See merge request Librem5/squeekboard!445
This commit is contained in:
Dorota Czaplejewicz
2021-04-09 08:36:06 +00:00
3 changed files with 3 additions and 3 deletions

View File

@ -587,7 +587,7 @@ fn create_action<H: logging::Handler>(
Text(String), Text(String),
Keysym(String), Keysym(String),
Modifier(Modifier), Modifier(Modifier),
}; }
let submission = match ( let submission = match (
&symbol_meta.action, &symbol_meta.action,

View File

@ -149,7 +149,7 @@ impl Submission {
enum Outcome { enum Outcome {
Submitted(Result<(), imservice::SubmitError>), Submitted(Result<(), imservice::SubmitError>),
NotSubmitted, NotSubmitted,
}; }
let submit_outcome = match data { let submit_outcome = match data {
SubmitData::Text(text) => { SubmitData::Text(text) => {

View File

@ -43,7 +43,7 @@ pub fn check_layout_file(path: &str) {
fn check_sym_in_keymap(state: &xkb::State, sym_name: &str) -> bool { fn check_sym_in_keymap(state: &xkb::State, sym_name: &str) -> bool {
let sym = xkb::keysym_from_name(sym_name, xkb::KEYSYM_NO_FLAGS); let sym = xkb::keysym_from_name(sym_name, xkb::KEYSYM_NO_FLAGS);
if sym == xkb::KEY_NoSymbol { if sym == xkb::KEY_NoSymbol {
panic!(format!("Entered invalid keysym: {}", sym_name)); panic!("Entered invalid keysym: {}", sym_name);
} }
let map = state.get_keymap(); let map = state.get_keymap();
let range = map.min_keycode()..=map.max_keycode(); let range = map.min_keycode()..=map.max_keycode();