From 1d91bcac134eded50bb0d364364001a0b0bb3f01 Mon Sep 17 00:00:00 2001
From: Nick Pillitteri <nick@56quarters.xyz>
Date: Sun, 29 Dec 2024 01:10:02 -0500
Subject: [PATCH] Remove some unnecessary clones from the high-level client

---
 mtop-client/src/client.rs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/mtop-client/src/client.rs b/mtop-client/src/client.rs
index 47e90e1..6712ddc 100644
--- a/mtop-client/src/client.rs
+++ b/mtop-client/src/client.rs
@@ -181,25 +181,22 @@ macro_rules! operation_for_all {
         let servers = $self.selector.servers().await;
         let tasks = servers
             .into_iter()
-            .map(|server| (server.clone(), spawn_for_host!($self, $method, &server)))
+            .map(|server| (server.id().clone(), spawn_for_host!($self, $method, &server)))
             .collect::<Vec<_>>();
 
         let mut values = HashMap::with_capacity(tasks.len());
         let mut errors = HashMap::new();
 
-        for (server, task) in tasks {
+        for (id, task) in tasks {
             match task.await {
                 Ok(Ok(results)) => {
-                    values.insert(server.id().clone(), results);
+                    values.insert(id, results);
                 }
                 Ok(Err(e)) => {
-                    errors.insert(server.id().clone(), e);
+                    errors.insert(id, e);
                 }
                 Err(e) => {
-                    errors.insert(
-                        server.id().clone(),
-                        MtopError::runtime_cause("fetching cluster values", e),
-                    );
+                    errors.insert(id, MtopError::runtime_cause("fetching cluster values", e));
                 }
             };
         }
@@ -349,22 +346,22 @@ where
 
         let tasks = by_server
             .into_iter()
-            .map(|(server, keys)| (server.clone(), spawn_for_host!(self, get, &server, &keys)))
+            .map(|(server, keys)| (server.id().clone(), spawn_for_host!(self, get, &server, &keys)))
             .collect::<Vec<_>>();
 
         let mut values = HashMap::with_capacity(num_keys);
         let mut errors = HashMap::new();
 
-        for (server, task) in tasks {
+        for (id, task) in tasks {
             match task.await {
                 Ok(Ok(results)) => {
                     values.extend(results);
                 }
                 Ok(Err(e)) => {
-                    errors.insert(server.id().clone(), e);
+                    errors.insert(id, e);
                 }
                 Err(e) => {
-                    errors.insert(server.id().clone(), MtopError::runtime_cause("fetching keys", e));
+                    errors.insert(id, MtopError::runtime_cause("fetching keys", e));
                 }
             };
         }