Fix formatting and clippy warnings for CI

Author: jlevere

crates/hidpp-daemon/src/daemon.rs

@@ -220,8 +220,7 @@ async fn connect_and_listen(
     wake_rx: &mut tokio::sync::mpsc::Receiver<()>,
 ) -> anyhow::Result<bool> {
     // Prevent system idle sleep during device setup (connect, discover, divert).
-    let _power_guard =
-        crate::platform::PowerAssertion::prevent_idle_sleep("HID++ device setup");
+    let _power_guard = crate::platform::PowerAssertion::prevent_idle_sleep("HID++ device setup");
 
     let device = connect_device(index_override).await?;
     let name = device.name().to_string();
@@ -351,9 +350,7 @@ async fn connect_and_listen(
 }
 
 /// Headless connect_and_listen — no diversion, no actions, just log.
-async fn connect_and_listen_headless(
-    index_override: Option<DeviceIndex>,
-) -> anyhow::Result<()> {
+async fn connect_and_listen_headless(index_override: Option<DeviceIndex>) -> anyhow::Result<()> {
     let device = connect_device(index_override).await?;
 
     let mut rx = device.subscribe();
@@ -448,9 +445,7 @@ fn handle_notification(
                                     gesture::GestureDirection::Up => gesture_cfg.up.as_ref(),
                                     gesture::GestureDirection::Down => gesture_cfg.down.as_ref(),
                                     gesture::GestureDirection::Left => gesture_cfg.left.as_ref(),
-                                    gesture::GestureDirection::Right => {
-                                        gesture_cfg.right.as_ref()
-                                    }
+                                    gesture::GestureDirection::Right => gesture_cfg.right.as_ref(),
                                 };
                                 (format!("swipe {dir_name}"), a)
                             }
@@ -479,11 +474,7 @@ fn handle_notification(
                     gestures.button_pressed(cid);
                 } else if let Some(action) = cfg.buttons.get(&cid) {
                     let desc = action_description(action);
-                    execute_and_notify(
-                        action,
-                        &format!("button CID {cid}: {desc}"),
-                        proxy,
-                    );
+                    execute_and_notify(action, &format!("button CID {cid}: {desc}"), proxy);
                 }
             }
         }

crates/hidpp-daemon/src/main.rs

@@ -182,9 +182,10 @@ fn run_tray_app(
                 rt.block_on(async {
                     #[cfg(unix)]
                     {
-                        let mut sigterm =
-                            tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
-                                .expect("SIGTERM handler");
+                        let mut sigterm = tokio::signal::unix::signal(
+                            tokio::signal::unix::SignalKind::terminate(),
+                        )
+                        .expect("SIGTERM handler");
                         sigterm.recv().await;
                     }
                     #[cfg(not(unix))]
@@ -204,7 +205,12 @@ fn run_tray_app(
     // Spawn background daemon thread.
     std::thread::spawn(move || {
         let rt = tokio::runtime::Runtime::new().expect("tokio runtime");
-        rt.block_on(daemon::run(&config_path, device_index, proxy.clone(), cmd_rx));
+        rt.block_on(daemon::run(
+            &config_path,
+            device_index,
+            proxy.clone(),
+            cmd_rx,
+        ));
         // Daemon exited (shutdown command or signal) — tell the event loop to quit.
         let _ = proxy.send_event(DaemonEvent::Shutdown);
     });
@@ -438,8 +444,8 @@ fn init_logging(log_level: &str) {
     #[cfg(not(target_os = "macos"))]
     {
         let home = std::env::var("HOME").unwrap_or_else(|_| ".".into());
-        let state_dir = std::env::var("XDG_STATE_HOME")
-            .unwrap_or_else(|_| format!("{home}/.local/state"));
+        let state_dir =
+            std::env::var("XDG_STATE_HOME").unwrap_or_else(|_| format!("{home}/.local/state"));
         let log_path = std::path::Path::new(&state_dir).join("hidpp/hidppd.log");
 
         if let Some(parent) = log_path.parent() {

crates/hidpp-daemon/src/platform.rs

@@ -7,8 +7,8 @@
 #[cfg(target_os = "macos")]
 #[allow(unsafe_code)]
 mod imp {
-    use std::ffi::c_void;
     use std::ffi::CString;
+    use std::ffi::c_void;
     use std::io::Read;
     use std::os::fd::FromRawFd;
 
@@ -44,9 +44,7 @@ mod imp {
             unsafe { notify_register_file_descriptor(name.as_ptr(), &mut fd, 0, &mut token) };
 
         if status != 0 || fd < 0 {
-            tracing::warn!(
-                "failed to register for power state notifications (status={status})"
-            );
+            tracing::warn!("failed to register for power state notifications (status={status})");
             return;
         }
 
@@ -80,14 +78,8 @@ mod imp {
         const K_CF_NUMBER_INT_TYPE: u64 = 9; // kCFNumberIntType
 
         unsafe extern "C" {
-            fn IOHIDManagerCreate(
-                allocator: *const c_void,
-                options: u32,
-            ) -> *mut c_void;
-            fn IOHIDManagerSetDeviceMatching(
-                manager: *mut c_void,
-                matching: *const c_void,
-            );
+            fn IOHIDManagerCreate(allocator: *const c_void, options: u32) -> *mut c_void;
+            fn IOHIDManagerSetDeviceMatching(manager: *mut c_void, matching: *const c_void);
             fn IOHIDManagerRegisterDeviceMatchingCallback(
                 manager: *mut c_void,
                 callback: unsafe extern "C" fn(*mut c_void, i32, *mut c_void, *mut c_void),
@@ -332,6 +324,6 @@ mod imp {
     }
 }
 
+pub use imp::PowerAssertion;
 pub use imp::spawn_hid_watcher;
 pub use imp::spawn_wake_watcher;
-pub use imp::PowerAssertion;

crates/hidpp-device/tests/integration.rs

@@ -95,7 +95,7 @@ async fn dpi_read() {
 
     let dpi = device.dpi_get().await.expect("DPI read failed");
 
-    assert!(dpi >= 200 && dpi <= 8000, "DPI out of range: {dpi}");
+    assert!((200..=8000).contains(&dpi), "DPI out of range: {dpi}");
     println!("DPI: {dpi}");
 }
 
@@ -221,7 +221,7 @@ async fn config_export() {
     println!("{toml}");
 
     // Should contain device name.
-    assert!(toml.contains("MX Master") || toml.contains(&device.name()));
+    assert!(toml.contains("MX Master") || toml.contains(device.name()));
 
     // Round-trip: parse the TOML back.
     let parsed = hidpp_device::DeviceConfig::from_toml(&toml).expect("TOML parse failed");

crates/hidpp-transport/src/native.rs

@@ -249,12 +249,7 @@ impl HidapiTransport {
         self.send(report).await?;
 
         // Wait for response with timeout.
-        match tokio::time::timeout(
-            Duration::from_millis(RESPONSE_TIMEOUT_MS),
-            response_rx,
-        )
-        .await
-        {
+        match tokio::time::timeout(Duration::from_millis(RESPONSE_TIMEOUT_MS), response_rx).await {
             Ok(Ok(response)) => Ok(response),
             Ok(Err(_)) => Err(TransportError::Disconnected),
             Err(_) => Err(TransportError::Timeout),