Bump MSRV to 1.85 and edition to 2024

winit-x11/src/util/cursor.rs

@@ -97,9 +97,7 @@ impl XConnection {
     /// Find the render format that corresponds to ARGB32.
     fn find_argb32_format(&self) -> Result<render::Pictformat, X11Error> {
         macro_rules! direct {
-            ($format:expr, $shift_name:ident, $mask_name:ident, $shift:expr) => {{
-                ($format).direct.$shift_name == $shift && ($format).direct.$mask_name == 0xff
-            }};
+            ($format:expr, $shift_name:ident, $mask_name:ident, $shift:expr) => {{ ($format).direct.$shift_name == $shift && ($format).direct.$mask_name == 0xff }};
         }
 
         self.render_formats()
@@ -202,7 +200,7 @@ impl CustomCursor {
         let mut cursor = match cursor {
             CustomCursorSource::Image(cursor_image) => cursor_image,
             CustomCursorSource::Animation { .. } | CustomCursorSource::Url { .. } => {
-                return Err(NotSupportedError::new("unsupported cursor kind").into())
+                return Err(NotSupportedError::new("unsupported cursor kind").into());
             },
         };
 

winit-x11/src/util/hint.rs

@@ -13,11 +13,7 @@ pub enum StateOperation {
 
 impl From<bool> for StateOperation {
     fn from(op: bool) -> Self {
-        if op {
-            StateOperation::Add
-        } else {
-            StateOperation::Remove
-        }
+        if op { StateOperation::Add } else { StateOperation::Remove }
     }
 }
 

winit-x11/src/util/memory.rs

@@ -9,11 +9,7 @@ impl<'a, T> XSmartPointer<'a, T> {
     // You're responsible for only passing things to this that should be XFree'd.
     // Returns None if ptr is null.
     pub fn new(xconn: &'a XConnection, ptr: *mut T) -> Option<Self> {
-        if !ptr.is_null() {
-            Some(XSmartPointer { xconn, ptr })
-        } else {
-            None
-        }
+        if !ptr.is_null() { Some(XSmartPointer { xconn, ptr }) } else { None }
     }
 }
 

winit-x11/src/util/randr.rs

@@ -31,11 +31,7 @@ pub fn calc_dpi_factor(
     // Quantize 1/12 step size
     let dpi_factor = ((ppmm * (12.0 * 25.4 / 96.0)).round() / 12.0).max(1.0);
     assert!(validate_scale_factor(dpi_factor));
-    if dpi_factor <= 20. {
-        dpi_factor
-    } else {
-        1.
-    }
+    if dpi_factor <= 20. { dpi_factor } else { 1. }
 }
 
 impl XConnection {