From 48a1e84906186c62bab3615a61db3b0cd9d14672 Mon Sep 17 00:00:00 2001 From: daxpedda Date: Sun, 8 Oct 2023 01:21:46 +0200 Subject: [PATCH] Update Clippy to v1.73 (#3135) --- src/platform_impl/linux/wayland/seat/keyboard/mod.rs | 8 ++++---- src/platform_impl/macos/event.rs | 4 ++-- src/platform_impl/macos/view.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/platform_impl/linux/wayland/seat/keyboard/mod.rs b/src/platform_impl/linux/wayland/seat/keyboard/mod.rs index f6abf95a..53139936 100644 --- a/src/platform_impl/linux/wayland/seat/keyboard/mod.rs +++ b/src/platform_impl/linux/wayland/seat/keyboard/mod.rs @@ -114,9 +114,9 @@ impl Dispatch for WinitState { } WlKeyboardEvent::Key { key, - state: key_state, + state: WEnum::Value(WlKeyState::Pressed), .. - } if key_state == WEnum::Value(WlKeyState::Pressed) => { + } => { let key = key + 8; key_input( @@ -184,9 +184,9 @@ impl Dispatch for WinitState { } WlKeyboardEvent::Key { key, - state: key_state, + state: WEnum::Value(WlKeyState::Released), .. - } if key_state == WEnum::Value(WlKeyState::Released) => { + } => { let key = key + 8; key_input( diff --git a/src/platform_impl/macos/event.rs b/src/platform_impl/macos/event.rs index 9f13787b..185edbf4 100644 --- a/src/platform_impl/macos/event.rs +++ b/src/platform_impl/macos/event.rs @@ -96,7 +96,7 @@ fn get_logical_key_char(ns_event: &NSEvent, modifierless_chars: &str) -> Key { let string = ns_event .charactersIgnoringModifiers() .map(|s| s.to_string()) - .unwrap_or_else(String::new); + .unwrap_or_default(); if string.is_empty() { // Probably a dead key let first_char = modifierless_chars.chars().next(); @@ -126,7 +126,7 @@ pub(crate) fn create_key_event( let characters = ns_event .characters() .map(|s| s.to_string()) - .unwrap_or_else(String::new); + .unwrap_or_default(); if characters.is_empty() { None } else { diff --git a/src/platform_impl/macos/view.rs b/src/platform_impl/macos/view.rs index f1fac52f..39ac40a5 100644 --- a/src/platform_impl/macos/view.rs +++ b/src/platform_impl/macos/view.rs @@ -850,7 +850,7 @@ impl WinitView { .expect("input context") .selectedKeyboardInputSource() .map(|input_source| input_source.to_string()) - .unwrap_or_else(String::new) + .unwrap_or_default() } pub(super) fn set_cursor_icon(&self, icon: Id) {