leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

collapse nested 'if' statements

Browse source
This commit is contained in:
daniel.eades 2023-11-16 17:52:36 +00:00 • committed by Ashley Wulber
parent e6010b147a
commit 03bb6ea3be
1 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
cosmic-applet-network/src/network_manager/mod.rs
View file

@ -92,30 +92,28 @@ async fn start_listening(
.await .await
.unwrap_or_default() .unwrap_or_default()
{ {
if c.id().await.unwrap_or_default() == ssid { if c.id().await.unwrap_or_default() == ssid
if network_manager.deactivate_connection(&c).await.is_ok() { && network_manager.deactivate_connection(&c).await.is_ok()
success = true; {
if let Ok(ActiveConnectionState::Deactivated) = c.state().await { success = true;
break; if let Ok(ActiveConnectionState::Deactivated) = c.state().await {
} else { break;
let mut changed = c.receive_state_changed().await; } else {
_ = tokio::time::timeout(Duration::from_secs(5), async move { let mut changed = c.receive_state_changed().await;
loop { _ = tokio::time::timeout(Duration::from_secs(5), async move {
if let Some(next) = changed.next().await { loop {
if let Ok(ActiveConnectionState::Deactivated) = next if let Some(next) = changed.next().await {
.get() if let Ok(ActiveConnectionState::Deactivated) =
.await next.get().await.map(ActiveConnectionState::from)
.map(ActiveConnectionState::from) {
{ break;
break;
}
} }
} }
}) }
.await; })
} .await;
break;
} }
break;
} }
} }
_ = output _ = output