From 931e30601ee3474d781524bd0c58f02b7bf56a5d Mon Sep 17 00:00:00 2001
From: ivmarkov <ivan.markov@gmail.com>
Date: Sun, 28 May 2023 11:13:02 +0000
Subject: [PATCH] Clippy

---
 matter/src/mdns.rs                | 33 +++++++++++++++++--------------
 matter/tests/interaction_model.rs |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/matter/src/mdns.rs b/matter/src/mdns.rs
index 80333b1..7564578 100644
--- a/matter/src/mdns.rs
+++ b/matter/src/mdns.rs
@@ -244,6 +244,7 @@ pub mod builtin {
 
     const IP_BIND_ADDR: (IpAddr, u16) = (IpAddr::V6(Ipv6Addr::UNSPECIFIED), 5353);
 
+    #[allow(clippy::too_many_arguments)]
     pub fn create_record(
         id: u16,
         hostname: &str,
@@ -552,6 +553,7 @@ pub mod builtin {
             select(&mut broadcast, &mut respond).await.unwrap()
         }
 
+        #[allow(clippy::await_holding_refcell_ref)]
         async fn broadcast(&self) -> Result<(), Error> {
             loop {
                 select(
@@ -562,29 +564,30 @@ pub mod builtin {
 
                 let mut index = 0;
 
-                while let Some(entry) = self
-                    .0
-                    .entries
-                    .borrow()
-                    .get(index)
-                    .map(|entry| entry.clone())
-                {
-                    info!("Broadasting mDNS entry {}", &entry.key);
+                loop {
+                    let entry = self.0.entries.borrow().get(index).cloned();
 
-                    self.0.bind().await?;
+                    if let Some(entry) = entry {
+                        info!("Broadasting mDNS entry {}", &entry.key);
 
-                    let udp = self.0.udp.borrow();
-                    let udp = udp.as_ref().unwrap();
+                        self.0.bind().await?;
 
-                    for (addr, port) in IP_BROADCAST_ADDRS {
-                        udp.send(SocketAddr::new(addr, port), &entry.record).await?;
+                        let udp = self.0.udp.borrow();
+                        let udp = udp.as_ref().unwrap();
+
+                        for (addr, port) in IP_BROADCAST_ADDRS {
+                            udp.send(SocketAddr::new(addr, port), &entry.record).await?;
+                        }
+
+                        index += 1;
+                    } else {
+                        break;
                     }
-
-                    index += 1;
                 }
             }
         }
 
+        #[allow(clippy::await_holding_refcell_ref)]
         async fn respond(&self) -> Result<(), Error> {
             loop {
                 let mut buf = [0; 1580];
diff --git a/matter/tests/interaction_model.rs b/matter/tests/interaction_model.rs
index 5d2c21a..9642ab2 100644
--- a/matter/tests/interaction_model.rs
+++ b/matter/tests/interaction_model.rs
@@ -68,7 +68,7 @@ impl DataHandler for DataModel {
                         continue;
                     };
                     let cmd_path_ib = i.path;
-                    let mut common_data = &mut self.node;
+                    let common_data = &mut self.node;
                     common_data.endpoint = cmd_path_ib.path.endpoint.unwrap_or(1);
                     common_data.cluster = cmd_path_ib.path.cluster.unwrap_or(0);
                     common_data.command = cmd_path_ib.path.leaf.unwrap_or(0) as u16;