From 960353b9dc774d25fa63dd296355dd4386b0ea35 Mon Sep 17 00:00:00 2001
From: Zach Birenbaum <zach@tracemachina.com>
Date: Fri, 29 Mar 2024 13:53:02 -0700
Subject: [PATCH] Fix nightly clippy warnings

Using clippy for the nightly rust toolchain is currently warnings
in a number of spots. This implements the suggested changes so
that all builds will not suddenly start failing if the toolchain
version used by precommit-hooks is updated.
---
 nativelink-service/tests/bytestream_server_test.rs |  1 -
 nativelink-store/src/grpc_store.rs                 | 12 ++++++------
 nativelink-util/src/proto_stream_utils.rs          |  2 +-
 nativelink-worker/src/running_actions_manager.rs   |  4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/nativelink-service/tests/bytestream_server_test.rs b/nativelink-service/tests/bytestream_server_test.rs
index 2c1d417d3..88bdf2d65 100644
--- a/nativelink-service/tests/bytestream_server_test.rs
+++ b/nativelink-service/tests/bytestream_server_test.rs
@@ -865,7 +865,6 @@ pub mod read_tests {
             .into_inner();
         {
             let mut roundtrip_data = Vec::with_capacity(VALUE1.len());
-            assert!(!VALUE1.is_empty(), "Expected at least one byte to be sent");
             while let Some(result_read_response) = read_stream.next().await {
                 roundtrip_data.append(&mut result_read_response?.data.to_vec());
             }
diff --git a/nativelink-store/src/grpc_store.rs b/nativelink-store/src/grpc_store.rs
index 12b17b8d9..47cbea2cb 100644
--- a/nativelink-store/src/grpc_store.rs
+++ b/nativelink-store/src/grpc_store.rs
@@ -143,7 +143,7 @@ impl GrpcStore {
         );
 
         let mut request = grpc_request.into_inner();
-        request.instance_name = self.instance_name.clone();
+        request.instance_name.clone_from(&self.instance_name);
         self.perform_request(request, |request| async move {
             let (connection, channel) = self.connection_manager.get_connection().await;
             let result = ContentAddressableStorageClient::new(channel)
@@ -168,7 +168,7 @@ impl GrpcStore {
         );
 
         let mut request = grpc_request.into_inner();
-        request.instance_name = self.instance_name.clone();
+        request.instance_name.clone_from(&self.instance_name);
         self.perform_request(request, |request| async move {
             let (connection, channel) = self.connection_manager.get_connection().await;
             let result = ContentAddressableStorageClient::new(channel)
@@ -193,7 +193,7 @@ impl GrpcStore {
         );
 
         let mut request = grpc_request.into_inner();
-        request.instance_name = self.instance_name.clone();
+        request.instance_name.clone_from(&self.instance_name);
         self.perform_request(request, |request| async move {
             let (connection, channel) = self.connection_manager.get_connection().await;
             let result = ContentAddressableStorageClient::new(channel)
@@ -218,7 +218,7 @@ impl GrpcStore {
         );
 
         let mut request = grpc_request.into_inner();
-        request.instance_name = self.instance_name.clone();
+        request.instance_name.clone_from(&self.instance_name);
         self.perform_request(request, |request| async move {
             let (connection, channel) = self.connection_manager.get_connection().await;
             let result = ContentAddressableStorageClient::new(channel)
@@ -377,7 +377,7 @@ impl GrpcStore {
         grpc_request: Request<GetActionResultRequest>,
     ) -> Result<Response<ActionResult>, Error> {
         let mut request = grpc_request.into_inner();
-        request.instance_name = self.instance_name.clone();
+        request.instance_name.clone_from(&self.instance_name);
         self.perform_request(request, |request| async move {
             let (connection, channel) = self.connection_manager.get_connection().await;
             let result = ActionCacheClient::new(channel)
@@ -397,7 +397,7 @@ impl GrpcStore {
         grpc_request: Request<UpdateActionResultRequest>,
     ) -> Result<Response<ActionResult>, Error> {
         let mut request = grpc_request.into_inner();
-        request.instance_name = self.instance_name.clone();
+        request.instance_name.clone_from(&self.instance_name);
         self.perform_request(request, |request| async move {
             let (connection, channel) = self.connection_manager.get_connection().await;
             let result = ActionCacheClient::new(channel)
diff --git a/nativelink-util/src/proto_stream_utils.rs b/nativelink-util/src/proto_stream_utils.rs
index 7839404f3..57cf86444 100644
--- a/nativelink-util/src/proto_stream_utils.rs
+++ b/nativelink-util/src/proto_stream_utils.rs
@@ -237,7 +237,7 @@ where
     }
 
     pub fn resume(&mut self) {
-        self.resume_queue = self.cached_messages.clone();
+        self.resume_queue.clone_from(&self.cached_messages);
         self.is_resumed = true;
     }
 
diff --git a/nativelink-worker/src/running_actions_manager.rs b/nativelink-worker/src/running_actions_manager.rs
index 1c573070b..3f1bd5c14 100644
--- a/nativelink-worker/src/running_actions_manager.rs
+++ b/nativelink-worker/src/running_actions_manager.rs
@@ -1545,7 +1545,7 @@ impl UploadActionResults {
                 .await;
             match maybe_message {
                 Ok(message) => {
-                    action_result.message = message.clone();
+                    action_result.message.clone_from(&message);
                     execute_response.message = message;
                     Ok(())
                 }
@@ -1555,7 +1555,7 @@ impl UploadActionResults {
             match Self::format_execute_response_message(message_template, action_info, None, hasher)
             {
                 Ok(message) => {
-                    action_result.message = message.clone();
+                    action_result.message.clone_from(&message);
                     execute_response.message = message;
                     Ok(())
                 }