clippy

n0-computer · Sep 11, 2024 · 20a5c0c · 20a5c0c
1 parent 407bb49
commit 20a5c0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/iroh-net/src/discovery/local_swarm_discovery.rs b/iroh-net/src/discovery/local_swarm_discovery.rs
@@ -410,8 +410,8 @@ mod tests {
                 assert_eq!(got_ids, node_ids);
                 anyhow::Ok(())
             };
-            let res = tokio::time::timeout(Duration::from_secs(5), test).await??;
-            Ok(res)
+            tokio::time::timeout(Duration::from_secs(5), test).await??;
+            Ok(())
         }
 
         fn make_discoverer() -> Result<(PublicKey, LocalSwarmDiscovery)> {

diff --git a/iroh-net/src/endpoint.rs b/iroh-net/src/endpoint.rs
@@ -767,10 +767,9 @@ impl Endpoint {
             .list_remote_infos()
             .into_iter()
             .filter(move |remote| {
-                remote
-                    .sources
-                    .iter()
-                    .any(|(source, elapsed)| source.is_discovery() && elapsed <= &duration)
+                remote.sources.iter().any(|(source, elapsed)| {
+                    matches!(source, Source::Discovery { .. }) && elapsed <= &duration
+                })
             })
     }
 

diff --git a/iroh-net/src/magicsock/node_map.rs b/iroh-net/src/magicsock/node_map.rs
@@ -121,14 +121,6 @@ impl Source {
         }
         false
     }
-
-    /// Returns true if the source is a [`Source::Discovery`]
-    pub fn is_discovery(&self) -> bool {
-        match self {
-            Source::Discovery { .. } => true,
-            _ => false,
-        }
-    }
 }
 
 impl NodeMap {