From e705c03981955ce2f06d35fe68586cadd161156e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Tue, 6 Feb 2024 18:34:17 +0100 Subject: [PATCH] Explicity use IndexMap::swap_remove to silence warnings --- crates/http/src/workers/swarm/storage.rs | 2 +- crates/udp/src/workers/statistics/mod.rs | 2 +- crates/udp/src/workers/swarm/storage.rs | 2 +- crates/ws/src/workers/swarm/storage.rs | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/http/src/workers/swarm/storage.rs b/crates/http/src/workers/swarm/storage.rs index a6419fc1..bc1246bf 100644 --- a/crates/http/src/workers/swarm/storage.rs +++ b/crates/http/src/workers/swarm/storage.rs @@ -433,7 +433,7 @@ impl LargePeerMap { } fn remove_peer(&mut self, key: &ResponsePeer) -> Option { - let opt_removed_peer = self.peers.remove(key); + let opt_removed_peer = self.peers.swap_remove(key); if let Some(Peer { is_seeder: true, .. diff --git a/crates/udp/src/workers/statistics/mod.rs b/crates/udp/src/workers/statistics/mod.rs index 25fc157d..beafa2d1 100644 --- a/crates/udp/src/workers/statistics/mod.rs +++ b/crates/udp/src/workers/statistics/mod.rs @@ -97,7 +97,7 @@ pub fn run_statistics_worker( *count -= 1; if *count == 0 { - peers.remove(&peer_id); + peers.swap_remove(&peer_id); } } } diff --git a/crates/udp/src/workers/swarm/storage.rs b/crates/udp/src/workers/swarm/storage.rs index 42893709..3b042eac 100644 --- a/crates/udp/src/workers/swarm/storage.rs +++ b/crates/udp/src/workers/swarm/storage.rs @@ -407,7 +407,7 @@ impl LargePeerMap { } fn remove_peer(&mut self, key: &ResponsePeer) -> Option { - let opt_removed_peer = self.peers.remove(key); + let opt_removed_peer = self.peers.swap_remove(key); if let Some(Peer { is_seeder: true, .. diff --git a/crates/ws/src/workers/swarm/storage.rs b/crates/ws/src/workers/swarm/storage.rs index 43820b40..1120305b 100644 --- a/crates/ws/src/workers/swarm/storage.rs +++ b/crates/ws/src/workers/swarm/storage.rs @@ -356,7 +356,7 @@ impl TorrentData { peer.valid_until = valid_until; } PeerStatus::Stopped => { - let peer = entry.remove(); + let peer = entry.swap_remove(); if peer.seeder { self.num_seeders -= 1; @@ -477,7 +477,7 @@ impl TorrentData { if answer_receiver .expecting_answers - .remove(&expecting_answer) + .swap_remove(&expecting_answer) .is_some() { let answer_out_message = AnswerOutMessage { @@ -519,7 +519,7 @@ impl TorrentData { peer_id: PeerId, #[cfg(feature = "metrics")] peer_gauge: &::metrics::Gauge, ) { - if let Some(peer) = self.peers.remove(&peer_id) { + if let Some(peer) = self.peers.swap_remove(&peer_id) { if peer.seeder { self.num_seeders -= 1; }