From 3cc7efbe550ba007276801ac2d1d2c4624194c9e Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Sun, 26 Feb 2023 22:25:54 +0100 Subject: [PATCH] Apply remaining clippy suggestions from clippy 1.67 --- bench/src/bin/bulk.rs | 4 ++-- perf/src/bin/perf_server.rs | 2 +- quinn-proto/src/connection/mod.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bench/src/bin/bulk.rs b/bench/src/bin/bulk.rs index f32cccbab..85e752552 100644 --- a/bench/src/bin/bulk.rs +++ b/bench/src/bin/bulk.rs @@ -79,10 +79,10 @@ async fn server(endpoint: quinn::Endpoint, opt: Opt) -> Result<()> { }; trace!("stream established"); - let _: tokio::task::JoinHandle> = tokio::spawn(async move { + tokio::spawn(async move { drain_stream(&mut recv_stream, opt.read_unordered).await?; send_data_on_stream(&mut send_stream, opt.download_size).await?; - Ok(()) + Ok::<_, anyhow::Error>(()) }); } diff --git a/perf/src/bin/perf_server.rs b/perf/src/bin/perf_server.rs index 9af0a73ab..c3dea41a6 100644 --- a/perf/src/bin/perf_server.rs +++ b/perf/src/bin/perf_server.rs @@ -53,7 +53,7 @@ async fn main() { async fn run(opt: Opt) -> Result<()> { let (key, cert) = match (&opt.key, &opt.cert) { - (&Some(ref key), &Some(ref cert)) => { + (Some(key), Some(cert)) => { let key = fs::read(key).context("reading key")?; let cert = fs::read(cert).expect("reading cert"); diff --git a/quinn-proto/src/connection/mod.rs b/quinn-proto/src/connection/mod.rs index d89a3272d..b3e81f083 100644 --- a/quinn-proto/src/connection/mod.rs +++ b/quinn-proto/src/connection/mod.rs @@ -1337,7 +1337,7 @@ impl Connection { let loss_delay = cmp::max(rtt.mul_f32(self.config.time_threshold), TIMER_GRANULARITY); // Packets sent before this time are deemed lost. - let lost_send_time = now - loss_delay; + let lost_send_time = now.checked_sub(loss_delay).unwrap(); let largest_acked_packet = self.spaces[pn_space].largest_acked_packet.unwrap(); let packet_threshold = self.config.packet_threshold as u64; let mut size_of_lost_packets = 0u64;