zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-09-15 19:26:58 +02:00
Code Activity

refactor(networkmanager): implement clippy::pedantic suggestions

Browse source
This commit is contained in:
Reinout Meliesie 2025-08-20 18:49:20 +02:00
commit f4369b20d3
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
2 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/clients/networkmanager/mod.rs
View file

@ -44,7 +44,7 @@ impl Client {
spawn(watch_device(added_device.to_owned(), tx.clone())); 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 // TODO: Cook up some way to notify closures for removed devices to exit
devices = new_devices; devices = new_devices;

44
src/modules/networkmanager.rs
View file

@ -122,38 +122,34 @@ async fn handle_update_events(
fn get_icon_for_device_state(r#type: &DeviceType, state: &DeviceState) -> Option<&'static str> { fn get_icon_for_device_state(r#type: &DeviceType, state: &DeviceState) -> Option<&'static str> {
match r#type { match r#type {
DeviceType::Ethernet => match state { DeviceType::Ethernet => match state {
DeviceState::Unavailable => Some("icon:network-wired-disconnected-symbolic"), DeviceState::Unavailable
DeviceState::Disconnected => Some("icon:network-wired-disconnected-symbolic"), | DeviceState::Disconnected
DeviceState::Prepare => Some("icon:network-wired-disconnected-symbolic"), | DeviceState::Prepare
DeviceState::Config => Some("icon:network-wired-disconnected-symbolic"), | DeviceState::Config
DeviceState::NeedAuth => Some("icon:network-wired-disconnected-symbolic"), | DeviceState::NeedAuth
DeviceState::IpConfig => Some("icon:network-wired-disconnected-symbolic"), | DeviceState::IpConfig
DeviceState::IpCheck => Some("icon:network-wired-disconnected-symbolic"), | DeviceState::IpCheck
DeviceState::Secondaries => Some("icon:network-wired-disconnected-symbolic"), | DeviceState::Secondaries
| DeviceState::Deactivating
| DeviceState::Failed => Some("icon:network-wired-disconnected-symbolic"),
DeviceState::Activated => Some("icon:network-wired-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, _ => None,
}, },
DeviceType::Wifi => match state { DeviceType::Wifi => match state {
DeviceState::Unavailable => Some("icon:network-wireless-hardware-disabled-symbolic"), DeviceState::Unavailable => Some("icon:network-wireless-hardware-disabled-symbolic"),
DeviceState::Disconnected => Some("icon:network-wireless-offline-symbolic"), DeviceState::Disconnected
DeviceState::Prepare => Some("icon:network-wireless-offline-symbolic"), | DeviceState::Prepare
DeviceState::Config => Some("icon:network-wireless-offline-symbolic"), | DeviceState::Config
DeviceState::NeedAuth => Some("icon:network-wireless-offline-symbolic"), | DeviceState::NeedAuth
DeviceState::IpConfig => Some("icon:network-wireless-offline-symbolic"), | DeviceState::IpConfig
DeviceState::IpCheck => Some("icon:network-wireless-offline-symbolic"), | DeviceState::IpCheck
DeviceState::Secondaries => Some("icon:network-wireless-offline-symbolic"), | DeviceState::Secondaries
| DeviceState::Deactivating
| DeviceState::Failed => Some("icon:network-wireless-offline-symbolic"),
DeviceState::Activated => Some("icon:network-wireless-connected-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, _ => None,
}, },
DeviceType::Tun => match state { DeviceType::Tun | DeviceType::Wireguard => match state {
DeviceState::Activated => Some("icon:network-vpn-symbolic"),
_ => None,
},
DeviceType::Wireguard => match state {
DeviceState::Activated => Some("icon:network-vpn-symbolic"), DeviceState::Activated => Some("icon:network-vpn-symbolic"),
_ => None, _ => None,
}, },