Skip to content

Commit

Permalink
Explicity use IndexMap::swap_remove to silence warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
greatest-ape committed Feb 6, 2024
1 parent 0b6a02e commit e705c03
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion crates/http/src/workers/swarm/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ impl<I: Ip> LargePeerMap<I> {
}

fn remove_peer(&mut self, key: &ResponsePeer<I>) -> Option<Peer> {
let opt_removed_peer = self.peers.remove(key);
let opt_removed_peer = self.peers.swap_remove(key);

if let Some(Peer {
is_seeder: true, ..
Expand Down
2 changes: 1 addition & 1 deletion crates/udp/src/workers/statistics/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pub fn run_statistics_worker(
*count -= 1;

if *count == 0 {
peers.remove(&peer_id);
peers.swap_remove(&peer_id);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/udp/src/workers/swarm/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ impl<I: Ip> LargePeerMap<I> {
}

fn remove_peer(&mut self, key: &ResponsePeer<I>) -> Option<Peer> {
let opt_removed_peer = self.peers.remove(key);
let opt_removed_peer = self.peers.swap_remove(key);

if let Some(Peer {
is_seeder: true, ..
Expand Down
6 changes: 3 additions & 3 deletions crates/ws/src/workers/swarm/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit e705c03

Please sign in to comment.