Bump MSRV to 1.85 and edition to 2024

winit-core/src/error.rs

@@ -35,11 +35,7 @@ impl fmt::Display for EventLoopError {
 
 impl Error for EventLoopError {
     fn source(&self) -> Option<&(dyn Error + 'static)> {
-        if let Self::Os(err) = self {
-            err.source()
-        } else {
-            None
-        }
+        if let Self::Os(err) = self { err.source() } else { None }
     }
 }
 
@@ -78,11 +74,7 @@ impl Display for RequestError {
 }
 impl Error for RequestError {
     fn source(&self) -> Option<&(dyn Error + 'static)> {
-        if let Self::Os(err) = self {
-            err.source()
-        } else {
-            None
-        }
+        if let Self::Os(err) = self { err.source() } else { None }
     }
 }
 
@@ -149,7 +141,5 @@ impl Error for OsError {
 
 #[allow(unused_macros)]
 macro_rules! os_error {
-    ($error:expr) => {{
-        crate::error::OsError::new(line!(), file!(), $error)
-    }};
+    ($error:expr) => {{ crate::error::OsError::new(line!(), file!(), $error) }};
 }

winit-core/src/event.rs

@@ -10,13 +10,13 @@ use dpi::{PhysicalPosition, PhysicalSize};
 use serde::{Deserialize, Serialize};
 use smol_str::SmolStr;
 
+use crate::Instant;
 use crate::error::RequestError;
 use crate::event_loop::AsyncRequestSerial;
 use crate::keyboard::{self, ModifiersKeyState, ModifiersKeys, ModifiersState};
 #[cfg(doc)]
 use crate::window::Window;
 use crate::window::{ActivationToken, Theme};
-use crate::Instant;
 
 /// Describes the reason the event loop is resuming.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -1117,11 +1117,7 @@ pub struct TabletToolData {
 impl TabletToolData {
     /// Returns [`TabletToolTilt`] if present or calculates it from [`TabletToolAngle`].
     pub fn tilt(self) -> Option<TabletToolTilt> {
-        if let Some(tilt) = self.tilt {
-            Some(tilt)
-        } else {
-            self.angle.map(TabletToolAngle::tilt)
-        }
+        if let Some(tilt) = self.tilt { Some(tilt) } else { self.angle.map(TabletToolAngle::tilt) }
     }
 
     /// Returns [`TabletToolAngle`] if present or calculates it from [`TabletToolTilt`].

winit-core/src/event_loop/mod.rs

@@ -2,18 +2,18 @@ pub mod pump_events;
 pub mod run_on_demand;
 
 use std::fmt::{self, Debug};
-use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicUsize, Ordering};
 use std::time::Duration;
 
 use rwh_06::{DisplayHandle, HandleError, HasDisplayHandle};
 
+use crate::Instant;
 use crate::as_any::AsAny;
 use crate::cursor::{CustomCursor, CustomCursorSource};
 use crate::error::RequestError;
 use crate::monitor::MonitorHandle;
 use crate::window::{Theme, Window, WindowAttributes};
-use crate::Instant;
 
 pub trait ActiveEventLoop: AsAny + fmt::Debug {
     /// Creates an [`EventLoopProxy`] that can be used to dispatch user events

winit-core/src/event_loop/run_on_demand.rs

@@ -2,7 +2,7 @@ use crate::application::ApplicationHandler;
 use crate::error::EventLoopError;
 #[cfg(doc)]
 use crate::{
-    event_loop::{pump_events::EventLoopExtPumpEvents, ActiveEventLoop},
+    event_loop::{ActiveEventLoop, pump_events::EventLoopExtPumpEvents},
     window::Window,
 };
 

winit-core/src/keyboard.rs

@@ -193,7 +193,7 @@ impl PartialEq<KeyCode> for PhysicalKey {
     #[inline]
     fn eq(&self, rhs: &KeyCode) -> bool {
         match self {
-            PhysicalKey::Code(ref code) => code == rhs,
+            PhysicalKey::Code(code) => code == rhs,
             _ => false,
         }
     }
@@ -210,7 +210,7 @@ impl PartialEq<NativeKeyCode> for PhysicalKey {
     #[inline]
     fn eq(&self, rhs: &NativeKeyCode) -> bool {
         match self {
-            PhysicalKey::Unidentified(ref code) => code == rhs,
+            PhysicalKey::Unidentified(code) => code == rhs,
             _ => false,
         }
     }
@@ -275,7 +275,7 @@ impl<Str> PartialEq<NamedKey> for Key<Str> {
     #[inline]
     fn eq(&self, rhs: &NamedKey) -> bool {
         match self {
-            Key::Named(ref a) => a == rhs,
+            Key::Named(a) => a == rhs,
             _ => false,
         }
     }
@@ -285,7 +285,7 @@ impl<Str: PartialEq<str>> PartialEq<str> for Key<Str> {
     #[inline]
     fn eq(&self, rhs: &str) -> bool {
         match self {
-            Key::Character(ref s) => s == rhs,
+            Key::Character(s) => s == rhs,
             _ => false,
         }
     }
@@ -302,7 +302,7 @@ impl<Str> PartialEq<NativeKey> for Key<Str> {
     #[inline]
     fn eq(&self, rhs: &NativeKey) -> bool {
         match self {
-            Key::Unidentified(ref code) => code == rhs,
+            Key::Unidentified(code) => code == rhs,
             _ => false,
         }
     }

winit-core/src/window.rs

@@ -2091,52 +2091,66 @@ mod tests {
         let position: Position = LogicalPosition::new(0, 0).into();
         let size: Size = LogicalSize::new(0, 0).into();
 
-        assert!(ImeEnableRequest::new(
-            ImeCapabilities::new().with_cursor_area(),
-            ImeRequestData::default()
-        )
-        .is_none());
-        assert!(ImeEnableRequest::new(
-            ImeCapabilities::new().with_hint_and_purpose(),
-            ImeRequestData::default()
-        )
-        .is_none());
+        assert!(
+            ImeEnableRequest::new(
+                ImeCapabilities::new().with_cursor_area(),
+                ImeRequestData::default()
+            )
+            .is_none()
+        );
+        assert!(
+            ImeEnableRequest::new(
+                ImeCapabilities::new().with_hint_and_purpose(),
+                ImeRequestData::default()
+            )
+            .is_none()
+        );
 
-        assert!(ImeEnableRequest::new(
-            ImeCapabilities::new().with_cursor_area(),
-            ImeRequestData::default().with_hint_and_purpose(ImeHint::NONE, ImePurpose::Normal)
-        )
-        .is_none());
+        assert!(
+            ImeEnableRequest::new(
+                ImeCapabilities::new().with_cursor_area(),
+                ImeRequestData::default().with_hint_and_purpose(ImeHint::NONE, ImePurpose::Normal)
+            )
+            .is_none()
+        );
 
-        assert!(ImeEnableRequest::new(
-            ImeCapabilities::new(),
-            ImeRequestData::default()
-                .with_hint_and_purpose(ImeHint::NONE, ImePurpose::Normal)
-                .with_cursor_area(position, size)
-        )
-        .is_none());
+        assert!(
+            ImeEnableRequest::new(
+                ImeCapabilities::new(),
+                ImeRequestData::default()
+                    .with_hint_and_purpose(ImeHint::NONE, ImePurpose::Normal)
+                    .with_cursor_area(position, size)
+            )
+            .is_none()
+        );
 
-        assert!(ImeEnableRequest::new(
-            ImeCapabilities::new().with_cursor_area(),
-            ImeRequestData::default()
-                .with_hint_and_purpose(ImeHint::NONE, ImePurpose::Normal)
-                .with_cursor_area(position, size)
-        )
-        .is_none());
+        assert!(
+            ImeEnableRequest::new(
+                ImeCapabilities::new().with_cursor_area(),
+                ImeRequestData::default()
+                    .with_hint_and_purpose(ImeHint::NONE, ImePurpose::Normal)
+                    .with_cursor_area(position, size)
+            )
+            .is_none()
+        );
 
-        assert!(ImeEnableRequest::new(
-            ImeCapabilities::new().with_cursor_area(),
-            ImeRequestData::default().with_cursor_area(position, size)
-        )
-        .is_some());
+        assert!(
+            ImeEnableRequest::new(
+                ImeCapabilities::new().with_cursor_area(),
+                ImeRequestData::default().with_cursor_area(position, size)
+            )
+            .is_some()
+        );
 
-        assert!(ImeEnableRequest::new(
-            ImeCapabilities::new().with_hint_and_purpose().with_cursor_area(),
-            ImeRequestData::default()
-                .with_hint_and_purpose(ImeHint::NONE, ImePurpose::Normal)
-                .with_cursor_area(position, size)
-        )
-        .is_some());
+        assert!(
+            ImeEnableRequest::new(
+                ImeCapabilities::new().with_hint_and_purpose().with_cursor_area(),
+                ImeRequestData::default()
+                    .with_hint_and_purpose(ImeHint::NONE, ImePurpose::Normal)
+                    .with_cursor_area(position, size)
+            )
+            .is_some()
+        );
 
         let text: &[u8] = ['a' as u8; 8000].as_slice();
         let text = std::str::from_utf8(text).unwrap();