From 76b7d231499b60e9db99dc1d404646180d878bd4 Mon Sep 17 00:00:00 2001
From: Igor Katson <igor.katson@gmail.com>
Date: Sun, 18 Feb 2024 20:16:18 +0000
Subject: [PATCH] Clippy

---
 crates/librqbit/src/session.rs     | 31 ++++++++++++------------------
 crates/librqbit_core/src/magnet.rs | 10 +++++-----
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/crates/librqbit/src/session.rs b/crates/librqbit/src/session.rs
index 6250425..73641af 100644
--- a/crates/librqbit/src/session.rs
+++ b/crates/librqbit/src/session.rs
@@ -13,10 +13,8 @@ use anyhow::{bail, Context};
 use bencode::{bencode_serialize_to_writer, BencodeDeserializer};
 use buffers::{ByteBuf, ByteBufT, ByteString};
 use clone_to_owned::CloneToOwned;
-use dht::{
-    Dht, DhtBuilder, DhtConfig, Id20, PersistentDht, PersistentDhtConfig, RequestPeersStream,
-};
-use futures::{stream::FuturesUnordered, Stream, TryFutureExt};
+use dht::{Dht, DhtBuilder, DhtConfig, Id20, PersistentDht, PersistentDhtConfig};
+use futures::{stream::FuturesUnordered, TryFutureExt};
 use librqbit_core::{
     directories::get_configuration_directory,
     magnet::Magnet,
@@ -43,7 +41,7 @@ use crate::{
     torrent_state::{
         ManagedTorrentBuilder, ManagedTorrentHandle, ManagedTorrentState, TorrentStateLive,
     },
-    tracker_comms::{self, TorrentStatsForTrackerDummy, TrackerComms},
+    tracker_comms::{self, TrackerComms},
     type_aliases::PeerStream,
 };
 
@@ -368,18 +366,6 @@ async fn create_tcp_listener(
     bail!("no free TCP ports in range {port_range:?}");
 }
 
-fn merge_peer_rx(
-    dht_rx: Option<RequestPeersStream>,
-    peer_rx: Option<impl Stream<Item = SocketAddr> + Unpin + Send + Sync + 'static>,
-) -> Option<PeerStream> {
-    match (dht_rx, peer_rx) {
-        (Some(dht_rx), None) => Some(Box::new(dht_rx)),
-        (None, Some(peer_rx)) => Some(Box::new(peer_rx)),
-        (None, None) => None,
-        (Some(dht_rx), Some(peer_rx)) => Some(Box::new(dht_rx.merge(peer_rx))),
-    }
-}
-
 pub(crate) struct CheckedIncomingConnection {
     pub addr: SocketAddr,
     pub stream: tokio::net::TcpStream,
@@ -1073,6 +1059,7 @@ impl Session {
         }
     }
 
+    // Get a peer stream from both DHT and trackers.
     fn make_peer_rx(
         &self,
         info_hash: Id20,
@@ -1095,8 +1082,14 @@ impl Session {
             cancel,
             announce_port,
         );
-        let peer_rx = merge_peer_rx(dht_rx, peer_rx);
-        Ok(peer_rx)
+
+        // Merge DHT rx and tracker comms peer rx.
+        match (dht_rx, peer_rx) {
+            (Some(dht_rx), None) => Ok(Some(Box::new(dht_rx))),
+            (None, Some(peer_rx)) => Ok(Some(Box::new(peer_rx))),
+            (None, None) => Ok(None),
+            (Some(dht_rx), Some(peer_rx)) => Ok(Some(Box::new(dht_rx.merge(peer_rx)))),
+        }
     }
 
     pub fn unpause(&self, handle: &ManagedTorrentHandle) -> anyhow::Result<()> {
diff --git a/crates/librqbit_core/src/magnet.rs b/crates/librqbit_core/src/magnet.rs
index 477dbf6..f0942bb 100644
--- a/crates/librqbit_core/src/magnet.rs
+++ b/crates/librqbit_core/src/magnet.rs
@@ -4,7 +4,6 @@ use anyhow::Context;
 
 use crate::hash_id::{Id20, Id32};
 
-
 /// A parsed magnet link.
 pub struct Magnet {
     id20: Option<Id20>,
@@ -45,7 +44,7 @@ impl Magnet {
                     } else {
                         anyhow::bail!("expected xt to start with btih or btmh");
                     }
-                },
+                }
                 "tr" => trackers.push(value.into()),
                 _ => {}
             }
@@ -93,7 +92,6 @@ impl std::fmt::Display for Magnet {
     }
 }
 
-
 #[cfg(test)]
 mod tests {
     #[test]
@@ -109,8 +107,10 @@ mod tests {
         use std::str::FromStr;
         let magnet = "magnet:?xt=urn:btmh:1220caf1e1c30e81cb361b9ee167c4aa64228a7fa4fa9f6105232b28ad099f3a302e&dn=bittorrent-v2-test
 ";
-        let info_hash = Id32::from_str("caf1e1c30e81cb361b9ee167c4aa64228a7fa4fa9f6105232b28ad099f3a302e").unwrap();
-        let m = Magnet::parse(&magnet).unwrap();
+        let info_hash =
+            Id32::from_str("caf1e1c30e81cb361b9ee167c4aa64228a7fa4fa9f6105232b28ad099f3a302e")
+                .unwrap();
+        let m = Magnet::parse(magnet).unwrap();
         assert!(m.as_id32() == Some(info_hash));
     }
 }