From 7e4ed79863f48bf43b3ef52ce9106c32606d0d62 Mon Sep 17 00:00:00 2001 From: Igor Katson Date: Tue, 13 Jul 2021 16:59:31 +0100 Subject: [PATCH] Nothing --- crates/dht/src/dht.rs | 17 +++++------------ crates/librqbit/src/torrent_manager.rs | 1 + crates/rqbit/src/main.rs | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/crates/dht/src/dht.rs b/crates/dht/src/dht.rs index 4492b19..0636a8e 100644 --- a/crates/dht/src/dht.rs +++ b/crates/dht/src/dht.rs @@ -19,11 +19,9 @@ use log::{debug, info, trace, warn}; use parking_lot::Mutex; use tokio::{ net::UdpSocket, - sync::mpsc::{ - channel, unbounded_channel, Receiver, Sender, UnboundedReceiver, UnboundedSender, - }, + sync::mpsc::{channel, unbounded_channel, Sender, UnboundedReceiver, UnboundedSender}, }; -use tokio_stream::wrappers::{BroadcastStream, UnboundedReceiverStream}; +use tokio_stream::wrappers::BroadcastStream; struct OutstandingRequest { transaction_id: u16, @@ -220,7 +218,7 @@ impl DhtState { .map(|c| c.iter().copied().collect()) .unwrap_or_default(); let rx = o.get().subscribe(); - return Ok((existing_peers, rx)); + Ok((existing_peers, rx)) } Entry::Vacant(v) => { let (tx, rx) = tokio::sync::broadcast::channel(100); @@ -243,7 +241,7 @@ impl DhtState { .context("DhtState: error sending to self.sender")?; } - return Ok((Vec::new(), rx)); + Ok((Vec::new(), rx)) } } } @@ -385,7 +383,7 @@ async fn run_framer( } } Err::<(), _>(anyhow::anyhow!( - "DHT UDP socket reader over, nowhere to read messages from" + "DHT UDP socket reader over, nowhere to send responses to" )) }; let result = tokio::select! { @@ -401,11 +399,6 @@ enum Request { FindNode(Id20), } -#[derive(Debug)] -enum Response { - Peer(SocketAddr), -} - #[derive(Clone)] pub struct Dht { state: Arc>, diff --git a/crates/librqbit/src/torrent_manager.rs b/crates/librqbit/src/torrent_manager.rs index 141f907..e05b14b 100644 --- a/crates/librqbit/src/torrent_manager.rs +++ b/crates/librqbit/src/torrent_manager.rs @@ -216,6 +216,7 @@ impl TorrentManager { lengths, ); + #[allow(clippy::needless_update)] let state_options = TorrentStateOptions { peer_connect_timeout: options.peer_connect_timeout, ..Default::default() diff --git a/crates/rqbit/src/main.rs b/crates/rqbit/src/main.rs index 5fc710f..43b3e1d 100644 --- a/crates/rqbit/src/main.rs +++ b/crates/rqbit/src/main.rs @@ -1,4 +1,4 @@ -use std::{fs::File, io::Read, net::SocketAddr, pin::Pin, str::FromStr, time::Duration}; +use std::{fs::File, io::Read, net::SocketAddr, str::FromStr, time::Duration}; use anyhow::Context; use clap::Clap;