From 9f9bb9c6733f0fa8488562398851abca81cecffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s?= Date: Sat, 7 Dec 2024 11:33:25 +0200 Subject: [PATCH] Cleaned up code a bit --- cosmic-applet-network/src/network_manager/mod.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/cosmic-applet-network/src/network_manager/mod.rs b/cosmic-applet-network/src/network_manager/mod.rs index a6d9d0a6..7a6ebf1b 100644 --- a/cosmic-applet-network/src/network_manager/mod.rs +++ b/cosmic-applet-network/src/network_manager/mod.rs @@ -479,15 +479,12 @@ impl NetworkManagerState { let devices = nm.devices().await?; for device in devices { - let device_hw_address = device.hw_address().await; - if device_hw_address.is_err() { - continue; - } - let device_hw_address = HwAddress::from_string(&device_hw_address.unwrap()); - if device_hw_address.is_none() { - continue; - } - let device_hw_address = device_hw_address.unwrap(); + let device_hw_address = device + .hw_address() + .await + .ok() + .and_then(|device_address| HwAddress::from_string(&device_address)) + .unwrap_or_default(); if device_hw_address != hw_address { continue; }