fix clippy and typo

Author: Murmele

typos.toml

@@ -6,5 +6,8 @@ XF86_Calculater = "XF86_Calculater" # From xkbcommon_dl::keysyms::XF86_Calculate
 ptd = "ptd"                         # From windows_sys::Win32::System::Com::FORMATETC { ptd, ..}
 requestor = "requestor"             # From x11_dl::xlib::XSelectionEvent { requestor ..}
 
+[default.extend-words]
+constrait = "constrait" # From winit-wayland/popup.rs constrait_adjustment.
+
 [files]
 extend-exclude = ["*.drawio"]

winit-wayland/src/event_loop/mod.rs

@@ -326,7 +326,7 @@ impl EventLoop {
             // We don't need to check here if it should be closed, because if the parent should
             // be closed all children must be closed as well
             let children =
-                state.windows.get_mut().get(&window_id).unwrap().lock().unwrap().children().clone();
+                state.windows.get_mut().get(window_id).unwrap().lock().unwrap().children().clone();
             // First all children and then all subchildren
             out.extend(&children);
             for child in children.clone() {
@@ -488,9 +488,10 @@ impl EventLoop {
                         let parent =
                             state.windows.get_mut().get_mut(&w).unwrap().lock().unwrap().parent();
 
-                        parent
-                            .and_then(|p| state.windows.get_mut().get_mut(&p))
-                            .map(|p| p.lock().unwrap().remove_child(&w));
+                        if let Some(p) = parent.and_then(|p| state.windows.get_mut().get_mut(&p)) {
+                            p.lock().unwrap().remove_child(&w)
+                        }
+
                         let window_requests = state.window_requests.get_mut();
                         window_requests.get(&w).unwrap().take_closed();
                         mem::drop(window_requests.remove(&w));

winit-wayland/src/popup.rs

@@ -5,15 +5,11 @@ use std::sync::{Arc, Mutex, Weak};
 use dpi::{LogicalPosition, PhysicalInsets, PhysicalPosition, PhysicalSize, Position, Size};
 use rwh_06::RawWindowHandle;
 use sctk::compositor::SurfaceData;
-use sctk::reexports::client::protocol::wl_surface::WlSurface;
 use sctk::shell::WaylandSurface;
 use sctk::shell::xdg::popup::Popup as SctkPopup;
 use sctk::shell::xdg::{XdgPositioner, XdgSurface};
 use wayland_client::Proxy;
 use wayland_client::protocol::wl_display::WlDisplay;
-use wayland_protocols::xdg::shell::client::xdg_positioner::{
-    Anchor, ConstraintAdjustment, Gravity,
-};
 use winit_core::cursor::Cursor;
 use winit_core::error::{NotSupportedError, RequestError};
 use winit_core::event::{Ime, WindowEvent};
@@ -122,7 +118,6 @@ impl Popup {
                     size.to_logical(scale_factor).width,
                     size.to_logical(scale_factor).height,
                 );
-                positioner.set_constraint_adjustment(ConstraintAdjustment::all());
 
                 let parent_surface = parent_window_state.window.xdg_surface();
                 let surface = state.compositor_state.create_surface(&queue_handle);
@@ -296,7 +291,7 @@ impl CoreWindow for Popup {
     }
 
     fn request_surface_size(&self, size: Size) -> Option<PhysicalSize<u32>> {
-        let Some(s) = self.popup_state.upgrade() else { return None };
+        let s = self.popup_state.upgrade()?;
         let mut popup_state = s.lock().unwrap();
         popup_state.request_surface_size(size);
         self.request_redraw();
@@ -335,7 +330,7 @@ impl CoreWindow for Popup {
     }
 
     fn surface_resize_increments(&self) -> Option<PhysicalSize<u32>> {
-        let Some(s) = self.popup_state.upgrade() else { return None };
+        let s = self.popup_state.upgrade()?;
         let popup_state = s.lock().unwrap();
         let scale_factor = popup_state.scale_factor();
         popup_state
@@ -462,7 +457,7 @@ impl CoreWindow for Popup {
 
     #[inline]
     fn ime_capabilities(&self) -> Option<ImeCapabilities> {
-        let Some(s) = self.popup_state.upgrade() else { return None };
+        let s = self.popup_state.upgrade()?;
         s.lock().unwrap().ime_allowed()
     }
 

winit-wayland/src/seat/keyboard/mod.rs

@@ -1,7 +1,6 @@
 //! The keyboard input handling.
 
 use std::sync::Mutex;
-use std::sync::atomic::Ordering;
 use std::time::Duration;
 
 use calloop::timer::{TimeoutAction, Timer};
@@ -232,12 +231,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
                 }
             },
             WlKeyboardEvent::Modifiers {
-                serial,
-                mods_depressed,
-                mods_latched,
-                mods_locked,
-                group,
-                ..
+                mods_depressed, mods_latched, mods_locked, group, ..
             } => {
                 let xkb_context = &mut keyboard_state.xkb_context;
                 let xkb_state = match xkb_context.state_mut() {

winit-wayland/src/seat/mod.rs

@@ -2,7 +2,6 @@
 
 use std::cell::Cell;
 use std::sync::Arc;
-use std::sync::atomic::{AtomicU32, Ordering};
 
 use foldhash::HashMap;
 use sctk::reexports::client::backend::ObjectId;

winit-wayland/src/seat/pointer/mod.rs

@@ -1,7 +1,6 @@
 //! The pointer events.
 
 use std::ops::Deref;
-use std::sync::atomic::Ordering;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 

winit-wayland/src/window/state.rs

@@ -214,6 +214,7 @@ pub struct WindowState {
 
 impl WindowState {
     /// Create new window state.
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         active_event_loop: &ActiveEventLoop,
         winit_state: &WinitState,