From 85b65dcef5a3f477231dc49306ae566783cd7648 Mon Sep 17 00:00:00 2001
From: Igor Katson <igor.katson@gmail.com>
Date: Wed, 4 Dec 2024 10:08:51 +0000
Subject: [PATCH] Rename a couple methods

---
 crates/librqbit/src/torrent_state/live/mod.rs          |  8 ++++----
 crates/librqbit/src/torrent_state/live/peer/mod.rs     | 10 +++++-----
 .../src/torrent_state/live/peer/stats/snapshot.rs      |  2 +-
 crates/librqbit/src/torrent_state/live/peers/mod.rs    |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/crates/librqbit/src/torrent_state/live/mod.rs b/crates/librqbit/src/torrent_state/live/mod.rs
index eec629f..975844e 100644
--- a/crates/librqbit/src/torrent_state/live/mod.rs
+++ b/crates/librqbit/src/torrent_state/live/mod.rs
@@ -674,7 +674,7 @@ impl TorrentStateLive {
                 .peers
                 .states
                 .iter()
-                .filter(|e| filter.state.matches(e.value().state.get()))
+                .filter(|e| filter.state.matches(e.value().state.get_state()))
                 .map(|e| (e.key().to_string(), e.value().into()))
                 .collect(),
         }
@@ -809,7 +809,7 @@ impl TorrentStateLive {
 
     fn disconnect_all_peers_that_have_full_torrent(&self) {
         for mut pe in self.peers.states.iter_mut() {
-            if let PeerState::Live(l) = pe.value().state.get() {
+            if let PeerState::Live(l) = pe.value().state.get_state() {
                 if l.has_full_torrent(self.lengths.total_pieces() as usize) {
                     let prev = pe.value_mut().state.set_not_needed(&self.peers);
                     let _ = prev
@@ -1122,7 +1122,7 @@ impl PeerHandler {
                 return Ok(());
             }
         };
-        let prev = pe.value_mut().state.take(pstats);
+        let prev = pe.value_mut().state.take_state(pstats);
 
         match prev {
             PeerState::Connecting(_) => {}
@@ -1201,7 +1201,7 @@ impl PeerHandler {
                     self.state
                         .peers
                         .with_peer_mut(handle, "dead_to_queued", |peer| {
-                            match peer.state.get() {
+                            match peer.state.get_state() {
                                 PeerState::Dead => {
                                     peer.state.set(PeerState::Queued, &self.state.peers)
                                 }
diff --git a/crates/librqbit/src/torrent_state/live/peer/mod.rs b/crates/librqbit/src/torrent_state/live/peer/mod.rs
index e173b96..6c35abb 100644
--- a/crates/librqbit/src/torrent_state/live/peer/mod.rs
+++ b/crates/librqbit/src/torrent_state/live/peer/mod.rs
@@ -59,7 +59,7 @@ impl Peer {
         known_address: SocketAddr,
         counters: &PeerStates,
     ) -> Option<SocketAddr> {
-        if let PeerState::NotNeeded = self.state.get() {
+        if let PeerState::NotNeeded = self.state.get_state() {
             match self.outgoing_address {
                 None => None,
                 Some(socket_addr) => {
@@ -125,11 +125,11 @@ impl PeerState {
 pub(crate) struct PeerStateNoMut(PeerState);
 
 impl PeerStateNoMut {
-    pub fn get(&self) -> &PeerState {
+    pub fn get_state(&self) -> &PeerState {
         &self.0
     }
 
-    pub fn take(&mut self, counters: &PeerStates) -> PeerState {
+    pub fn take_state(&mut self, counters: &PeerStates) -> PeerState {
         self.set(Default::default(), counters)
     }
 
@@ -185,7 +185,7 @@ impl PeerStateNoMut {
         if matches!(&self.0, PeerState::Connecting(..) | PeerState::Live(..)) {
             anyhow::bail!("peer already active");
         }
-        match self.take(counters) {
+        match self.take_state(counters) {
             PeerState::Queued | PeerState::Dead | PeerState::NotNeeded => {
                 self.set(
                     PeerState::Live(LivePeerState::new(peer_id, tx, true)),
@@ -203,7 +203,7 @@ impl PeerStateNoMut {
         counters: &PeerStates,
     ) -> Option<&mut LivePeerState> {
         if let PeerState::Connecting(_) = &self.0 {
-            let tx = match self.take(counters) {
+            let tx = match self.take_state(counters) {
                 PeerState::Connecting(tx) => tx,
                 _ => unreachable!(),
             };
diff --git a/crates/librqbit/src/torrent_state/live/peer/stats/snapshot.rs b/crates/librqbit/src/torrent_state/live/peer/stats/snapshot.rs
index 471e3f7..602ef5d 100644
--- a/crates/librqbit/src/torrent_state/live/peer/stats/snapshot.rs
+++ b/crates/librqbit/src/torrent_state/live/peer/stats/snapshot.rs
@@ -51,7 +51,7 @@ impl From<&Peer> for PeerStats {
     fn from(peer: &Peer) -> Self {
         Self {
             counters: peer.stats.counters.as_ref().into(),
-            state: peer.state.get().name(),
+            state: peer.state.get_state().name(),
         }
     }
 }
diff --git a/crates/librqbit/src/torrent_state/live/peers/mod.rs b/crates/librqbit/src/torrent_state/live/peers/mod.rs
index e68dafb..602d59f 100644
--- a/crates/librqbit/src/torrent_state/live/peers/mod.rs
+++ b/crates/librqbit/src/torrent_state/live/peers/mod.rs
@@ -87,7 +87,7 @@ impl PeerStates {
 
     pub fn drop_peer(&self, handle: PeerHandle) -> Option<Peer> {
         let p = self.states.remove(&handle).map(|r| r.1)?;
-        let s = p.state.get();
+        let s = p.state.get_state();
         self.stats.dec(s);
         self.session_stats.peers.dec(s);