Merge pull request #2177 from Bravo555/clippy-fixes

Fix clippy lints for rust 1.73
thin-edge · Aug 21, 2023 · 92a505d · 92a505d · github-actions · Aug 21, 2023
2 parents d35823f + 49ae2a5
commit 92a505d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git a/crates/common/download/src/download.rs b/crates/common/download/src/download.rs
@@ -167,7 +167,7 @@ impl Downloader {
         );
 
         if file_len > 0 {
-            try_pre_allocate_space(&mut file, &tmp_target_path, file_len)?;
+            try_pre_allocate_space(&file, &tmp_target_path, file_len)?;
             debug!("preallocated space for file {tmp_target_path:?}, len={file_len}");
         }
 
@@ -447,11 +447,7 @@ enum SaveChunksError {
 }
 
 #[allow(clippy::unnecessary_cast)]
-fn try_pre_allocate_space(
-    file: &mut File,
-    path: &Path,
-    file_len: u64,
-) -> Result<(), DownloadError> {
+fn try_pre_allocate_space(file: &File, path: &Path, file_len: u64) -> Result<(), DownloadError> {
     if file_len == 0 {
         return Ok(());
     }

diff --git a/crates/common/logged_command/src/logged_command.rs b/crates/common/logged_command/src/logged_command.rs
@@ -34,7 +34,7 @@ impl LoggingChild {
         let mut status = CmdStatus::Successful;
         tokio::select! {
             outcome = self.inner_child.wait_with_output() => {
-               Self::update_and_log_outcome(cmd_line, outcome, logger, graceful_timeout, &mut status).await
+               Self::update_and_log_outcome(cmd_line, outcome, logger, graceful_timeout, &status).await
             }
             _ = Self::timeout_operation(&mut status, cid, graceful_timeout, forceful_timeout) => {
                 Err(std::io::Error::new(std::io::ErrorKind::Other,"failed to kill the process: {cmd_line}"))
@@ -59,7 +59,7 @@ impl LoggingChild {
         outcome: Result<Output, std::io::Error>,
         logger: &mut BufWriter<File>,
         timeout: Duration,
-        status: &mut CmdStatus,
+        status: &CmdStatus,
     ) -> Result<Output, std::io::Error> {
         let outcome = match status {
             CmdStatus::Successful => outcome,

diff --git a/crates/common/mqtt_channel/src/connection.rs b/crates/common/mqtt_channel/src/connection.rs
@@ -297,16 +297,12 @@ impl Connection {
     }
 
     pub(crate) fn pause_on_error(err: &ConnectionError) -> bool {
-        match &err {
-            rumqttc::ConnectionError::Io(_) => true,
-            rumqttc::ConnectionError::MqttState(state_error)
-                if matches!(state_error, StateError::Io(_)) =>
-            {
-                true
-            }
-            rumqttc::ConnectionError::MqttState(_) => true,
-            _ => false,
-        }
+        matches!(
+            err,
+            rumqttc::ConnectionError::Io(_)
+                | rumqttc::ConnectionError::MqttState(StateError::Io(_))
+                | rumqttc::ConnectionError::MqttState(_)
+        )
     }
 
     pub(crate) async fn do_pause() {

diff --git a/crates/core/plugin_sm/src/operation_logs.rs b/crates/core/plugin_sm/src/operation_logs.rs
@@ -88,12 +88,12 @@ impl OperationLogs {
                 if path.starts_with("software-list") {
                     log_tracker
                         .entry("software-list".to_string())
-                        .or_insert_with(BinaryHeap::new)
+                        .or_default()
                         .push(Reverse(path.to_string()));
                 } else if path.starts_with("software-update") {
                     log_tracker
                         .entry("software-update".to_string())
-                        .or_insert_with(BinaryHeap::new)
+                        .or_default()
                         .push(Reverse(path.to_string()));
                 } else {
                     let file_name = path
@@ -102,7 +102,7 @@ impl OperationLogs {
                         .ok_or(OperationLogsError::FileFormatError)?;
                     log_tracker
                         .entry(file_name.to_string())
-                        .or_insert_with(BinaryHeap::new)
+                        .or_default()
                         .push(Reverse(path.to_string()));
                 }
             }