From 0ffeaf7e91e08f3838b2b809a093b2d673a33f08 Mon Sep 17 00:00:00 2001
From: Ferdinand Schober <ferdinandschober20@gmail.com>
Date: Sun, 14 Jul 2024 17:56:54 +0200
Subject: [PATCH] simplify

---
 src/server.rs | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/server.rs b/src/server.rs
index aefbcf5..d7a60ab 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -193,23 +193,21 @@ impl Server {
                     log::debug!("handled frontend request");
                 }
                 _ = self.notifies.frontend_event_pending.notified() => {
-                    loop {
+                    while let Some(event) = {
+                        /* need to drop borrow before next iteration! */
                         let event = self.pending_frontend_events.borrow_mut().pop_front();
-                        if let Some(event) = event {
-                            frontend.broadcast(event).await;
-                        } else {
-                            break;
-                        }
+                        event
+                    } {
+                        frontend.broadcast(event).await;
                     }
                 },
                 _ = self.notifies.dns_request_pending.notified() => {
-                    loop {
+                    while let Some(request) = {
+                        /* need to drop borrow before next iteration! */
                         let request = self.pending_dns_requests.borrow_mut().pop_front();
-                        if let Some(request) = request {
-                            dns_request.send(request).await.expect("channel closed");
-                        } else {
-                            break;
-                        }
+                        request
+                    } {
+                        dns_request.send(request).await.expect("channel closed");
                     }
                 }
                 _ = self.cancelled() => break,