From 066c091b568c37af83d7f7fcc10cf434c29779e1 Mon Sep 17 00:00:00 2001 From: Martin Marmsoler Date: Mon, 13 Jul 2026 09:32:50 +0200 Subject: [PATCH] fix clippy --- winit-common/src/xkb/compose.rs | 8 +++----- winit/examples/child_window.rs | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/winit-common/src/xkb/compose.rs b/winit-common/src/xkb/compose.rs index 37830ca84..6321b0e2f 100644 --- a/winit-common/src/xkb/compose.rs +++ b/winit-common/src/xkb/compose.rs @@ -22,11 +22,9 @@ pub struct XkbComposeTable { impl XkbComposeTable { pub fn new(context: &XkbContext) -> Option { let locale = env::var_os("LC_ALL") - .and_then(|v| if v.is_empty() { None } else { Some(v) }) - .or_else(|| env::var_os("LC_CTYPE")) - .and_then(|v| if v.is_empty() { None } else { Some(v) }) - .or_else(|| env::var_os("LANG")) - .and_then(|v| if v.is_empty() { None } else { Some(v) }) + .filter(|v| !v.is_empty()) + .or_else(|| env::var_os("LC_CTYPE").filter(|v| !v.is_empty())) + .or_else(|| env::var_os("LANG").filter(|v| !v.is_empty())) .unwrap_or_else(|| "C".into()); let locale = CString::new(locale.into_vec()).unwrap(); diff --git a/winit/examples/child_window.rs b/winit/examples/child_window.rs index 228802a46..24c72ffd8 100644 --- a/winit/examples/child_window.rs +++ b/winit/examples/child_window.rs @@ -59,7 +59,7 @@ fn main() -> Result<(), impl std::error::Error> { self.windows.clear(); event_loop.exit(); }, - WindowEvent::PointerEntered { device_id: _, .. } => { + WindowEvent::PointerEntered { .. } => { // On x11, log when the cursor entered in a window even if the child window // is created by some key inputs. // the child windows are always placed at (0, 0) with size (200, 200) in the