Drop all unnecessary self.state.clone()

In many cases, cloning the Arc<Mutex<…>> or Arc<RwLock<…>> doesn't seem to be needed as it can just be dereferenced directly.
liskin · Jun 6, 2023 · 3f21138 · 3f21138
1 parent 07f4e71
commit 3f21138
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 22 deletions.
diff --git a/src/mock.rs b/src/mock.rs
@@ -440,8 +440,7 @@ impl Mock {
     ///
     #[track_caller]
     pub fn assert(&self) {
-        let mutex = self.state.clone();
-        let state = mutex.read().unwrap();
+        let state = self.state.read().unwrap();
         if let Some(hits) = state.get_mock_hits(self.inner.id.clone()) {
             let matched = self.matched_hits(hits);
             let message = if !matched {
@@ -461,8 +460,7 @@ impl Mock {
     /// Same as `Mock::assert` but async.
     ///
     pub async fn assert_async(&self) {
-        let mutex = self.state.clone();
-        let state = mutex.read().unwrap();
+        let state = self.state.read().unwrap();
         if let Some(hits) = state.get_mock_hits(self.inner.id.clone()) {
             let matched = self.matched_hits(hits);
             let message = if !matched {
@@ -482,8 +480,7 @@ impl Mock {
     /// Returns whether the expected amount of requests (defaults to 1) were performed.
     ///
     pub fn matched(&self) -> bool {
-        let mutex = self.state.clone();
-        let state = mutex.read().unwrap();
+        let state = self.state.read().unwrap();
         let Some(hits) = state.get_mock_hits(self.inner.id.clone()) else {
             return false;
         };
@@ -495,8 +492,7 @@ impl Mock {
     /// Same as `Mock::matched` but async.
     ///
     pub async fn matched_async(&self) -> bool {
-        let mutex = self.state.clone();
-        let state = mutex.read().unwrap();
+        let state = self.state.read().unwrap();
         let Some(hits) = state.get_mock_hits(self.inner.id.clone()) else {
             return false;
         };
@@ -544,17 +540,15 @@ impl Mock {
     /// Removes the mock from the server.
     ///
     pub fn remove(&self) {
-        let mutex = self.state.clone();
-        let mut state = mutex.write().unwrap();
+        let mut state = self.state.write().unwrap();
         state.remove_mock(self.inner.id.clone());
     }
 
     ///
     /// Same as `Mock::remove` but async.
     ///
     pub async fn remove_async(&self) {
-        let mutex = self.state.clone();
-        let mut state = mutex.write().unwrap();
+        let mut state = self.state.write().unwrap();
         state.remove_mock(self.inner.id.clone());
     }
 

diff --git a/src/server.rs b/src/server.rs
@@ -318,8 +318,7 @@ impl Server {
     /// Removes all the mocks stored on the server.
     ///
     pub fn reset(&mut self) {
-        let state = self.state.clone();
-        let mut state = state.write().unwrap();
+        let mut state = self.state.write().unwrap();
         state.mocks.clear();
         state.unmatched_requests.clear();
     }
@@ -329,8 +328,7 @@ impl Server {
     ///
     #[deprecated(since = "1.0.1", note = "Use `Server::reset` instead")]
     pub async fn reset_async(&mut self) {
-        let state = self.state.clone();
-        let mut state = state.write().unwrap();
+        let mut state = self.state.write().unwrap();
         state.mocks.clear();
         state.unmatched_requests.clear();
     }
@@ -356,8 +354,7 @@ async fn handle_request(
     request.read_body().await;
     log::debug!("Request received: {}", request.formatted());
 
-    let mutex = state.clone();
-    let mut state = mutex.write().unwrap();
+    let mut state = state.write().unwrap();
     let mut matching_mocks: Vec<&mut RemoteMock> = vec![];
 
     for mock in state.mocks.iter_mut() {

diff --git a/src/server_pool.rs b/src/server_pool.rs
@@ -84,8 +84,7 @@ impl ServerPool {
             None
         };
 
-        let state_mutex = self.state.clone();
-        let mut state = state_mutex.lock().unwrap();
+        let mut state = self.state.lock().unwrap();
 
         if let Some(server) = server {
             state.push_back(server);
@@ -100,8 +99,7 @@ impl ServerPool {
 
     fn recycle(&self, mut server: Server) {
         server.reset();
-        let state_mutex = self.state.clone();
-        let mut state = state_mutex.lock().unwrap();
+        let mut state = self.state.lock().unwrap();
         state.push_back(server);
     }
 }