From f39c4c430ebcc677e33b42ca085dca469f213654 Mon Sep 17 00:00:00 2001
From: Jake Stanger <mail@jstanger.dev>
Date: Sat, 15 Feb 2025 23:18:57 +0000
Subject: [PATCH] refactor: fix clippy warnings

---
 src/clients/upower/{device.rs => dbus.rs}     | 37 ++++++++++++++++
 src/clients/upower/mod.rs                     |  7 ++-
 src/clients/upower/upower.rs                  | 43 -------------------
 src/clients/wayland/mod.rs                    |  4 +-
 src/clients/wayland/wlr_data_control/offer.rs |  2 +-
 5 files changed, 43 insertions(+), 50 deletions(-)
 rename src/clients/upower/{device.rs => dbus.rs} (71%)
 delete mode 100644 src/clients/upower/upower.rs

diff --git a/src/clients/upower/device.rs b/src/clients/upower/dbus.rs
similarity index 71%
rename from src/clients/upower/device.rs
rename to src/clients/upower/dbus.rs
index 2808d35..3c265fd 100644
--- a/src/clients/upower/device.rs
+++ b/src/clients/upower/dbus.rs
@@ -120,3 +120,40 @@ pub trait Device {
     #[zbus(property)]
     fn voltage(&self) -> zbus::Result<f64>;
 }
+
+#[proxy(interface = "org.freedesktop.UPower", assume_defaults = true)]
+pub trait UPower {
+    /// EnumerateDevices method
+    fn enumerate_devices(&self) -> zbus::Result<Vec<zbus::zvariant::OwnedObjectPath>>;
+
+    /// GetCriticalAction method
+    fn get_critical_action(&self) -> zbus::Result<String>;
+
+    /// GetDisplayDevice method
+    #[zbus(object = "Device")]
+    fn get_display_device(&self);
+
+    /// DeviceAdded signal
+    #[zbus(signal)]
+    fn device_added(&self, device: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>;
+
+    /// DeviceRemoved signal
+    #[zbus(signal)]
+    fn device_removed(&self, device: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>;
+
+    /// DaemonVersion property
+    #[zbus(property)]
+    fn daemon_version(&self) -> zbus::Result<String>;
+
+    /// LidIsClosed property
+    #[zbus(property)]
+    fn lid_is_closed(&self) -> zbus::Result<bool>;
+
+    /// LidIsPresent property
+    #[zbus(property)]
+    fn lid_is_present(&self) -> zbus::Result<bool>;
+
+    /// OnBattery property
+    #[zbus(property)]
+    fn on_battery(&self) -> zbus::Result<bool>;
+}
diff --git a/src/clients/upower/mod.rs b/src/clients/upower/mod.rs
index cf9e47d..1d2231f 100644
--- a/src/clients/upower/mod.rs
+++ b/src/clients/upower/mod.rs
@@ -1,14 +1,13 @@
-mod device;
-mod upower;
+mod dbus;
 
 use crate::clients::ClientResult;
 use crate::register_fallible_client;
+use dbus::UPowerProxy;
 use std::sync::Arc;
-use upower::UPowerProxy;
 use zbus::fdo::PropertiesProxy;
 use zbus::proxy::CacheProperties;
 
-pub use device::BatteryState;
+pub use dbus::BatteryState;
 
 pub async fn create_display_proxy() -> ClientResult<PropertiesProxy<'static>> {
     let dbus = Box::pin(zbus::Connection::system()).await?;
diff --git a/src/clients/upower/upower.rs b/src/clients/upower/upower.rs
deleted file mode 100644
index d9470f0..0000000
--- a/src/clients/upower/upower.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use super::device::DeviceProxy;
-/// Originally taken from `upower-dbus` crate
-/// https://github.com/pop-os/upower-dbus/blob/main/LICENSE
-// Copyright 2021 System76 <info@system76.com>
-// SPDX-License-Identifier: MPL-2.0
-use zbus::proxy;
-
-#[proxy(interface = "org.freedesktop.UPower", assume_defaults = true)]
-pub trait UPower {
-    /// EnumerateDevices method
-    fn enumerate_devices(&self) -> zbus::Result<Vec<zbus::zvariant::OwnedObjectPath>>;
-
-    /// GetCriticalAction method
-    fn get_critical_action(&self) -> zbus::Result<String>;
-
-    /// GetDisplayDevice method
-    #[zbus(object = "Device")]
-    fn get_display_device(&self);
-
-    /// DeviceAdded signal
-    #[zbus(signal)]
-    fn device_added(&self, device: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>;
-
-    /// DeviceRemoved signal
-    #[zbus(signal)]
-    fn device_removed(&self, device: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>;
-
-    /// DaemonVersion property
-    #[zbus(property)]
-    fn daemon_version(&self) -> zbus::Result<String>;
-
-    /// LidIsClosed property
-    #[zbus(property)]
-    fn lid_is_closed(&self) -> zbus::Result<bool>;
-
-    /// LidIsPresent property
-    #[zbus(property)]
-    fn lid_is_present(&self) -> zbus::Result<bool>;
-
-    /// OnBattery property
-    #[zbus(property)]
-    fn on_battery(&self) -> zbus::Result<bool>;
-}
diff --git a/src/clients/wayland/mod.rs b/src/clients/wayland/mod.rs
index ac09cad..c338075 100644
--- a/src/clients/wayland/mod.rs
+++ b/src/clients/wayland/mod.rs
@@ -336,7 +336,7 @@ impl Environment {
                 let handle = env
                     .handles
                     .iter()
-                    .find(|handle| handle.info().map_or(false, |info| info.id == id));
+                    .find(|handle| handle.info().is_some_and(|info| info.id == id));
 
                 if let Some(handle) = handle {
                     let seat = env.default_seat();
@@ -350,7 +350,7 @@ impl Environment {
                 let handle = env
                     .handles
                     .iter()
-                    .find(|handle| handle.info().map_or(false, |info| info.id == id));
+                    .find(|handle| handle.info().is_some_and(|info| info.id == id));
 
                 if let Some(handle) = handle {
                     handle.minimize();
diff --git a/src/clients/wayland/wlr_data_control/offer.rs b/src/clients/wayland/wlr_data_control/offer.rs
index 4b58bd1..5310918 100644
--- a/src/clients/wayland/wlr_data_control/offer.rs
+++ b/src/clients/wayland/wlr_data_control/offer.rs
@@ -175,5 +175,5 @@ pub fn receive(offer: &ZwlrDataControlOfferV1, mime_type: String) -> std::io::Re
 
     offer.receive(mime_type, writefd.as_fd());
 
-    Ok(Receiver::from_owned_fd(readfd)?)
+    Receiver::from_owned_fd(readfd)
 }