diff --git a/src/platform_impl/macos/event.rs b/src/platform_impl/macos/event.rs index 02d6b9c2..ebad2482 100644 --- a/src/platform_impl/macos/event.rs +++ b/src/platform_impl/macos/event.rs @@ -208,7 +208,7 @@ pub fn scancode_to_keycode(scancode: c_ushort) -> Option { // While F1-F20 have scancodes we can match on, we have to check against UTF-16 // constants for the rest. // https://developer.apple.com/documentation/appkit/1535851-function-key_unicodes?preferredLanguage=occ -pub fn check_function_keys(string: &String) -> Option { +pub fn check_function_keys(string: &str) -> Option { if let Some(ch) = string.encode_utf16().next() { return Some(match ch { 0xf718 => VirtualKeyCode::F21, diff --git a/src/platform_impl/macos/monitor.rs b/src/platform_impl/macos/monitor.rs index 7688e31a..976f6c90 100644 --- a/src/platform_impl/macos/monitor.rs +++ b/src/platform_impl/macos/monitor.rs @@ -248,7 +248,6 @@ impl MonitorHandle { assert!(!array.is_null(), "failed to get list of display modes"); let array_count = CFArrayGetCount(array); let modes: Vec<_> = (0..array_count) - .into_iter() .map(move |i| { let mode = CFArrayGetValueAtIndex(array, i) as *mut _; ffi::CGDisplayModeRetain(mode); diff --git a/src/platform_impl/macos/view.rs b/src/platform_impl/macos/view.rs index 31a427c3..d7c9edc6 100644 --- a/src/platform_impl/macos/view.rs +++ b/src/platform_impl/macos/view.rs @@ -520,10 +520,7 @@ fn retrieve_keycode(event: id) -> Option { #[inline] fn get_code(ev: id, raw: bool) -> Option { let characters = get_characters(ev, raw); - characters - .chars() - .next() - .map_or(None, |c| char_to_keycode(c)) + characters.chars().next().and_then(|c| char_to_keycode(c)) } // Cmd switches Roman letters for Dvorak-QWERTY layout, so we try modified characters first.