From 8ea0a10049c06ac56d310dd9278cba6bc471befa Mon Sep 17 00:00:00 2001
From: Devdutt Shenoi <devdutt@bytebeam.io>
Date: Fri, 5 Apr 2024 18:45:09 +0530
Subject: [PATCH] ci: clippy suggestions

---
 storage/src/lib.rs                     | 4 ++--
 uplink/src/base/bridge/actions_lane.rs | 2 +-
 uplink/src/base/serializer/metrics.rs  | 2 +-
 uplink/src/collector/downloader.rs     | 4 ++--
 uplink/src/collector/preconditions.rs  | 2 +-
 uplink/src/collector/script_runner.rs  | 2 +-
 uplink/src/collector/systemstats.rs    | 5 +----
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/storage/src/lib.rs b/storage/src/lib.rs
index d692cbc7..217b30e4 100644
--- a/storage/src/lib.rs
+++ b/storage/src/lib.rs
@@ -1,5 +1,5 @@
 use bytes::{Buf, BufMut, BytesMut};
-use log::{self, debug, error, info, warn};
+use log::{debug, error, info, warn};
 use seahash::hash;
 
 use std::collections::VecDeque;
@@ -268,7 +268,7 @@ impl<'a> PersistenceFile<'a> {
     /// Write contents of buffer from memory onto the persistence file in disk
     pub fn write(&mut self, buf: &mut BytesMut) -> Result<(), Error> {
         let path = self.path();
-        let mut file = OpenOptions::new().write(true).create(true).open(path)?;
+        let mut file = OpenOptions::new().write(true).create(true).truncate(true).open(path)?;
 
         let hash = hash(&buf[..]);
         file.write_all(&hash.to_be_bytes())?;
diff --git a/uplink/src/base/bridge/actions_lane.rs b/uplink/src/base/bridge/actions_lane.rs
index 5fc0d5ee..814cbdb8 100644
--- a/uplink/src/base/bridge/actions_lane.rs
+++ b/uplink/src/base/bridge/actions_lane.rs
@@ -340,7 +340,7 @@ impl ActionsBridge {
             action.name, fwd_name, action.action_id,
         );
 
-        action.name = fwd_name.to_owned();
+        fwd_name.clone_into(&mut action.name);
 
         if let Err(e) = self.try_route_action(action.clone()) {
             error!("Failed to route action to app. Error = {:?}", e);
diff --git a/uplink/src/base/serializer/metrics.rs b/uplink/src/base/serializer/metrics.rs
index a0380230..9b1f67a6 100644
--- a/uplink/src/base/serializer/metrics.rs
+++ b/uplink/src/base/serializer/metrics.rs
@@ -48,7 +48,7 @@ impl Metrics {
     }
 
     pub fn set_mode(&mut self, name: &str) {
-        self.mode = name.to_owned();
+        name.clone_into(&mut self.mode);
     }
 
     pub fn batches(&self) -> usize {
diff --git a/uplink/src/collector/downloader.rs b/uplink/src/collector/downloader.rs
index e2d64e1c..8139819a 100644
--- a/uplink/src/collector/downloader.rs
+++ b/uplink/src/collector/downloader.rs
@@ -149,7 +149,7 @@ impl FileDownloader {
 
         info!("Downloader thread is ready to receive download actions");
         while let Ok(action) = self.actions_rx.recv_async().await {
-            self.action_id = action.action_id.clone();
+            action.action_id.clone_into(&mut self.action_id);
             let mut state = match DownloadState::new(action, &self.config) {
                 Ok(s) => s,
                 Err(e) => {
@@ -186,7 +186,7 @@ impl FileDownloader {
                 return;
             }
         };
-        self.action_id = state.current.action.action_id.clone();
+        state.current.action.action_id.clone_into(&mut self.action_id);
 
         if let Err(e) = self.download(&mut state).await {
             self.forward_error(e).await;
diff --git a/uplink/src/collector/preconditions.rs b/uplink/src/collector/preconditions.rs
index 402c5ec1..9f904529 100644
--- a/uplink/src/collector/preconditions.rs
+++ b/uplink/src/collector/preconditions.rs
@@ -63,7 +63,7 @@ impl PreconditionChecker {
     // comparison instead of making assumptions about what the user might want.
     fn check_disk_size(&self, preconditions: Preconditions) -> Result<(), Error> {
         let Some(mut required_free_space) = preconditions.uncompressed_length else {
-            return Ok(())
+            return Ok(());
         };
         let disk_free_space =
             fs2::free_space(&self.config.precondition_checks.as_ref().unwrap().path)? as usize;
diff --git a/uplink/src/collector/script_runner.rs b/uplink/src/collector/script_runner.rs
index 1f970e49..40a0fadd 100644
--- a/uplink/src/collector/script_runner.rs
+++ b/uplink/src/collector/script_runner.rs
@@ -75,7 +75,7 @@ impl ScriptRunner {
                             continue;
                         },
                     };
-                    status.action_id = id.to_owned();
+                    id.clone_into(&mut status.action_id);
 
                     debug!("Action status: {:?}", status);
                     self.forward_status(status).await;
diff --git a/uplink/src/collector/systemstats.rs b/uplink/src/collector/systemstats.rs
index ccdc53a4..96fba74c 100644
--- a/uplink/src/collector/systemstats.rs
+++ b/uplink/src/collector/systemstats.rs
@@ -45,10 +45,7 @@ pub struct System {
 impl System {
     fn init(sys: &sysinfo::System) -> System {
         System {
-            kernel_version: match sys.kernel_version() {
-                Some(kv) => kv,
-                None => String::default(),
-            },
+            kernel_version: sys.kernel_version().unwrap_or_default(),
             total_memory: sys.total_memory(),
             ..Default::default()
         }