From f4369b20d395fa78d942dffb0e17ce712399056e Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Wed, 20 Aug 2025 18:49:20 +0200 Subject: [PATCH] refactor(networkmanager): implement clippy::pedantic suggestions --- src/clients/networkmanager/mod.rs | 2 +- src/modules/networkmanager.rs | 44 ++++++++++++++----------------- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/clients/networkmanager/mod.rs b/src/clients/networkmanager/mod.rs index 1a25183..94cb82d 100644 --- a/src/clients/networkmanager/mod.rs +++ b/src/clients/networkmanager/mod.rs @@ -44,7 +44,7 @@ impl Client { spawn(watch_device(added_device.to_owned(), tx.clone())); } - let removed_devices = devices.difference(&new_devices); + let _removed_devices = devices.difference(&new_devices); // TODO: Cook up some way to notify closures for removed devices to exit devices = new_devices; diff --git a/src/modules/networkmanager.rs b/src/modules/networkmanager.rs index 8ca128b..ea8b8d9 100644 --- a/src/modules/networkmanager.rs +++ b/src/modules/networkmanager.rs @@ -122,38 +122,34 @@ async fn handle_update_events( fn get_icon_for_device_state(r#type: &DeviceType, state: &DeviceState) -> Option<&'static str> { match r#type { DeviceType::Ethernet => match state { - DeviceState::Unavailable => Some("icon:network-wired-disconnected-symbolic"), - DeviceState::Disconnected => Some("icon:network-wired-disconnected-symbolic"), - DeviceState::Prepare => Some("icon:network-wired-disconnected-symbolic"), - DeviceState::Config => Some("icon:network-wired-disconnected-symbolic"), - DeviceState::NeedAuth => Some("icon:network-wired-disconnected-symbolic"), - DeviceState::IpConfig => Some("icon:network-wired-disconnected-symbolic"), - DeviceState::IpCheck => Some("icon:network-wired-disconnected-symbolic"), - DeviceState::Secondaries => Some("icon:network-wired-disconnected-symbolic"), + DeviceState::Unavailable + | DeviceState::Disconnected + | DeviceState::Prepare + | DeviceState::Config + | DeviceState::NeedAuth + | DeviceState::IpConfig + | DeviceState::IpCheck + | DeviceState::Secondaries + | DeviceState::Deactivating + | DeviceState::Failed => Some("icon:network-wired-disconnected-symbolic"), DeviceState::Activated => Some("icon:network-wired-symbolic"), - DeviceState::Deactivating => Some("icon:network-wired-disconnected-symbolic"), - DeviceState::Failed => Some("icon:network-wired-disconnected-symbolic"), _ => None, }, DeviceType::Wifi => match state { DeviceState::Unavailable => Some("icon:network-wireless-hardware-disabled-symbolic"), - DeviceState::Disconnected => Some("icon:network-wireless-offline-symbolic"), - DeviceState::Prepare => Some("icon:network-wireless-offline-symbolic"), - DeviceState::Config => Some("icon:network-wireless-offline-symbolic"), - DeviceState::NeedAuth => Some("icon:network-wireless-offline-symbolic"), - DeviceState::IpConfig => Some("icon:network-wireless-offline-symbolic"), - DeviceState::IpCheck => Some("icon:network-wireless-offline-symbolic"), - DeviceState::Secondaries => Some("icon:network-wireless-offline-symbolic"), + DeviceState::Disconnected + | DeviceState::Prepare + | DeviceState::Config + | DeviceState::NeedAuth + | DeviceState::IpConfig + | DeviceState::IpCheck + | DeviceState::Secondaries + | DeviceState::Deactivating + | DeviceState::Failed => Some("icon:network-wireless-offline-symbolic"), DeviceState::Activated => Some("icon:network-wireless-connected-symbolic"), - DeviceState::Deactivating => Some("icon:network-wireless-offline-symbolic"), - DeviceState::Failed => Some("icon:network-wireless-offline-symbolic"), _ => None, }, - DeviceType::Tun => match state { - DeviceState::Activated => Some("icon:network-vpn-symbolic"), - _ => None, - }, - DeviceType::Wireguard => match state { + DeviceType::Tun | DeviceType::Wireguard => match state { DeviceState::Activated => Some("icon:network-vpn-symbolic"), _ => None, },