Clippy lints fixes for latest code (#433)

Signed-off-by: Lukasz Woznicki <lukasz.woznicki@softwareag.com>

44 files changed, 160 insertions, 162 deletions

diff --git a/.gitignore b/.gitignore
index 1dc1b9f5..a157d72c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,4 @@ tests/PySys/**/*.out
 tests/PySys/**/*.err
 **/__pycache__
 tests/PySys/**/Output/
-**/*venv
+**/*venv*
diff --git a/common/batcher/src/batch.rs b/common/batcher/src/batch.rs
index 0b8cfdc9..8c06d5c6 100644
--- a/common/batcher/src/batch.rs
+++ b/common/batcher/src/batch.rs
@@ -148,7 +148,7 @@ mod tests {
         let event2 = TestBatchEvent::new(1, 40);
 
         let mut batch = Batch::new(batch_start, batch_end, event1.clone());
-        assert!(matches!(batch.add(event2.clone()), BatchAdd::Duplicate));
+        assert!(matches!(batch.add(event2), BatchAdd::Duplicate));
 
         let result = batch.into_vec();
         assert_eq!(result.len(), 1);
diff --git a/common/batcher/src/batcher.rs b/common/batcher/src/batcher.rs
index ce843105..8edef2bd 100644
--- a/common/batcher/src/batcher.rs
+++ b/common/batcher/src/batcher.rs
@@ -485,12 +485,7 @@ mod tests {
                 match action {
                     EventOrTimer::Event(event) => {
                         let outputs = self.batcher.event(t, event);
-                        self.handle_outputs(
-                            t,
-                            outputs,
-                            &mut actual_batches,
-                            self.flush_time.clone(),
-                        );
+                        self.handle_outputs(t, outputs, &mut actual_batches, self.flush_time);
                     }
                     EventOrTimer::Timer() => {
                         actual_batches.insert(t, self.batcher.time(t));
@@ -586,7 +581,7 @@ mod tests {
         }
     }
 
-    fn match_batches(batch1: &Vec<TestBatchEvent>, batch2: &Vec<TestBatchEvent>) -> bool {
+    fn match_batches(batch1: &[TestBatchEvent], batch2: &[TestBatchEvent]) -> bool {
         if batch1.len() != batch2.len() {
             return false;
         }
diff --git a/common/certificate/src/lib.rs b/common/certificate/src/lib.rs
index c89328e5..efef5e93 100644
--- a/common/certificate/src/lib.rs
+++ b/common/certificate/src/lib.rs
@@ -184,17 +184,17 @@ mod tests {
         let pem_string = keypair
             .certificate_pem_string()
             .expect("Fail to read the certificate PEM");
-        let pem = PemCertificate::from_pem_string(&pem_string)
-            .expect("Fail to decode the certificate PEM");
-        pem
+        PemCertificate::from_pem_string(&pem_string).expect("Fail to decode the certificate PEM")
     }
 
     #[test]
     fn self_signed_cert_subject_is_the_device() {
         // Create a certificate with a given subject
-        let mut config = NewCertificateConfig::default();
-        config.organization_name = "Acme".to_owned();
-        config.organizational_unit_name = "IoT".to_owned();
+        let config = NewCertificateConfig {
+            organization_name: "Acme".to_owned(),
+            organizational_unit_name: "IoT".to_owned(),
+            ..Default::default()
+        };
         let id = "device-serial-number";
 
         let keypair = KeyCertPair::new_selfsigned_certificate(&config, id)
@@ -209,9 +209,11 @@ mod tests {
     #[test]
     fn self_signed_cert_common_name_is_the_device_id() {
         // Create a certificate with a given subject
-        let mut config = NewCertificateConfig::default();
-        config.organization_name = "Acme".to_owned();
-        config.organizational_unit_name = "IoT".to_owned();
+        let config = NewCertificateConfig {
+            organization_name: "Acme".to_owned(),
+            organizational_unit_name: "IoT".to_owned(),
+            ..Default::default()
+        };
         let device_id = "device-identifier";
 
         let keypair = KeyCertPair::new_selfsigned_certificate(&config, device_id)
@@ -228,9 +230,11 @@ mod tests {
     #[test]
     fn self_signed_cert_issuer_is_the_device() {
         // Create a certificate with a given subject
-        let mut config = NewCertificateConfig::default();
-        config.organization_name = "Acme".to_owned();
-        config.organizational_unit_name = "IoT".to_owned();
+        let config = NewCertificateConfig {
+            organization_name: "Acme".to_owned(),
+            organizational_unit_name: "IoT".to_owned(),
+            ..Default::default()
+        };
         let id = "device-serial-number";
 
         let keypair = KeyCertPair::new_selfsigned_certificate(&config, id)
@@ -265,8 +269,10 @@ mod tests {
     #[test]
     fn self_signed_cert_no_after_is_related_to_birthdate() {
         // Create a certificate with a given birthdate.
-        let mut config = NewCertificateConfig::default();
-        config.validity_period_days = 10;
+        let config = NewCertificateConfig {
+            validity_period_days: 10,
+            ..Default::default()
+        };
         let id = "some-id";
         let birthdate = DateTime::parse_from_rfc3339("2021-03-31T16:39:57+01:00")
             .unwrap()
diff --git a/common/flockfile/src/unix.rs b/common/flockfile/src/unix.rs
index 2ea985d4..491e37ad 100644
--- a/common/flockfile/src/unix.rs
+++ b/common/flockfile/src/unix.rs
@@ -10,10 +10,10 @@ use tracing::{debug, warn};
 #[derive(thiserror::Error, Debug)]
 pub enum FlockfileError {
     #[error(transparent)]
-    IoError(#[from] std::io::Error),
+    FromIo(#[from] std::io::Error),
 
     #[error("Couldn't acquire file lock.")]
-    NixError(#[from] nix::Error),
+    FromNix(#[from] nix::Error),
 }
 
 /// flockfile creates a lockfile in the filesystem under `/run/lock` and then creates a filelock using system fcntl with flock.
@@ -130,7 +130,7 @@ mod tests {
 
         assert_matches!(
             Flockfile::new_lock(&path).unwrap_err(),
-            FlockfileError::NixError(_)
+            FlockfileError::FromNix(_)
         );
     }
 }
diff --git a/common/json_writer/src/lib.rs b/common/json_writer/src/lib.rs
index 3af65909..2bd4541d 100644
--- a/common/json_writer/src/lib.rs
+++ b/common/json_writer/src/lib.rs
@@ -12,10 +12,10 @@ pub enum JsonWriterError {
     InvalidUtf8Conversion(#[from] std::string::FromUtf8Error),
 
     #[error("IoError")]
-    IoError(#[from] std::io::Error),
+    FromIo(#[from] std::io::Error),
 
     #[error("Serde Json error")]
-    SerdeJsonError(#[from] serde_json::Error),
+    FromSerdeJson(#[from] serde_json::Error),
 
     #[error("Invalid f64 value {value:?}")]
     InvalidF64Value { value: f64 },
diff --git a/common/mqtt_client/examples/temperature_publisher.rs b/common/mqtt_client/examples/temperature_publisher.rs
index d62c7d7e..0a045def 100644
--- a/common/mqtt_client/examples/temperature_publisher.rs
+++ b/common/mqtt_client/examples/temperature_publisher.rs
@@ -44,7 +44,7 @@ async fn publish_temperature(mqtt: Client, c8y_msg: Topic) -> Result<(), MqttCli
     info!("Publishing temperature measurements");
     for _ in 1..10 {
         let delta = random_in_range(-1, 2);
-        temperature = temperature + delta;
+        temperature += delta;
 
         let payload = format!("{},{}", C8Y_TEMPLATE_TEMPERATURE, temperature);
         debug!("{}", payload);
diff --git a/common/mqtt_client/src/lib.rs b/common/mqtt_client/src/lib.rs
index 435273bb..633dc46c 100644
--- a/common/mqtt_client/src/lib.rs
+++ b/common/mqtt_client/src/lib.rs
@@ -539,7 +539,8 @@ impl TopicFilter {
     pub fn add(&mut self, pattern: &str) -> Result<(), MqttClientError> {
         let pattern = String::from(pattern);
         if rumqttc::valid_filter(&pattern) {
-            Ok(self.patterns.push(pattern))
+            self.patterns.push(pattern);
+            Ok(())
         } else {
             Err(MqttClientError::InvalidFilter { pattern })
         }
@@ -549,7 +550,7 @@ impl TopicFilter {
     fn accept(&self, topic: &Topic) -> bool {
         self.patterns
             .iter()
-            .any(|pattern| rumqttc::matches(&topic.name, &pattern))
+            .any(|pattern| rumqttc::matches(&topic.name, pattern))
     }
 
     pub fn qos(self, qos: QoS) -> Self {
@@ -601,7 +602,7 @@ impl Message {
     pub fn payload_trimmed(&self) -> &[u8] {
         self.payload
             .strip_suffix(&[0])
-            .unwrap_or(self.payload.as_slice())
+            .unwrap_or_else(|| self.payload.as_slice())
     }
 
     // This function trims the null character at the end of the payload before converting into UTF8
diff --git a/common/tedge_utils/src/fs.rs b/common/tedge_utils/src/fs.rs
index b17b6156..f84b1dc3 100644
--- a/common/tedge_utils/src/fs.rs
+++ b/common/tedge_utils/src/fs.rs
@@ -65,7 +65,7 @@ mod tests {
 
         let content = "test_data";
 
-        let () = atomically_write_file_async(&temp_path, &destination_path, &content.as_bytes())
+        let () = atomically_write_file_async(&temp_path, &destination_path, content.as_bytes())
             .await
             .unwrap();
 
@@ -86,7 +86,7 @@ mod tests {
         let content = "test_data";
 
         let () =
-            atomically_write_file_sync(&temp_path, &destination_path, &content.as_bytes()).unwrap();
+            atomically_write_file_sync(&temp_path, &destination_path, content.as_bytes()).unwrap();
 
         std::fs::File::open(&temp_path).unwrap_err();
         if let Ok(destination_content) = std::fs::read(&destination_path) {
diff --git a/mapper/cumulocity/c8y_translator_lib/benches/thin_edge_json.rs b/mapper/cumulocity/c8y_translator_lib/benches/thin_edge_json.rs
index 88f93816..148f03a3 100644
--- a/mapper/cumulocity/c8y_translator_lib/benches/thin_edge_json.rs
+++ b/mapper/cumulocity/c8y_translator_lib/benches/thin_edge_json.rs
@@ -35,7 +35,7 @@ fn translate_2_measurements(c: &mut Criterion) {
             "temperature": 12.34,
             "pressure": 56.78
         }"#;
-    sanity_check(&message);
+    sanity_check(message);
 
     c.bench_function(id, |b| b.iter(|| json::from_thin_edge_json(message)));
 }
diff --git a/mapper/tedge_mapper/src/az_converter.rs b/mapper/tedge_mapper/src/az_converter.rs
index b99fee87..7d20fd50 100644
--- a/mapper/tedge_mapper/src/az_converter.rs
+++ b/mapper/tedge_mapper/src/az_converter.rs
@@ -174,7 +174,7 @@ mod tests {
 
         assert_matches!(
             result,
-            Err(ConversionError::MessageSizeExceededError(
+            Err(ConversionError::SizeThresholdExceeded(
                 SizeThresholdExceeded {
                     actual_size: 3,
                     threshold: 1
diff --git a/mapper/tedge_mapper/src/collectd_mapper/batcher.rs b/mapper/tedge_mapper/src/collectd_mapper/batcher.rs
index 2f9429bc..74aae691 100644
--- a/mapper/tedge_mapper/src/collectd_mapper/batcher.rs
+++ b/mapper/tedge_mapper/src/collectd_mapper/batcher.rs
@@ -35,7 +35,7 @@ impl MessageBatch {
             let payload = tedge_json_serializer.bytes()?;
             Ok(payload)
         } else {
-            Err(DeviceMonitorError::InvalidThinEdgeJsonError(
+            Err(DeviceMonitorError::FromInvalidThinEdgeJson(
                 MeasurementGrouperError::UnexpectedEnd,
             ))
         }
diff --git a/mapper/tedge_mapper/src/collectd_mapper/error.rs b/mapper/tedge_mapper/src/collectd_mapper/error.rs
index 4f1d66fe..c80a9d17 100644
--- a/mapper/tedge_mapper/src/collectd_mapper/error.rs
+++ b/mapper/tedge_mapper/src/collectd_mapper/error.rs
@@ -3,19 +3,19 @@ use tokio::sync::mpsc::error::SendError;
 #[derive(thiserror::Error, Debug)]
 pub enum DeviceMonitorError {
     #[error(transparent)]
-    MqttClientError(#[from] mqtt_client::MqttClientError),
+    FromMqttClient(#[from] mqtt_client::MqttClientError),
 
     #[error(transparent)]
-    InvalidCollectdMeasurementError(#[from] crate::collectd_mapper::collectd::CollectdError),
+    FromInvalidCollectdMeasurement(#[from] crate::collectd_mapper::collectd::CollectdError),
 
     #[error(transparent)]
-    InvalidThinEdgeJsonError(#[from] thin_edge_json::group::MeasurementGrouperError),
+    FromInvalidThinEdgeJson(#[from] thin_edge_json::group::MeasurementGrouperError),
 
     #[error(transparent)]
-    ThinEdgeJsonSerializationError(
+    FromThinEdgeJsonSerializationError(
         #[from] thin_edge_json::serialize::ThinEdgeJsonSerializationError,
     ),
 
     #[error(transparent)]
-    BatchingError(#[from] SendError<thin_edge_json::group::MeasurementGrouper>),
+    FromBatchingError(#[from] SendError<thin_edge_json::group::MeasurementGrouper>),
 }
diff --git a/mapper/tedge_mapper/src/error.rs b/mapper/tedge_mapper/src/error.rs
index dbbff251..7c49550c 100644
--- a/mapper/tedge_mapper/src/error.rs
+++ b/mapper/tedge_mapper/src/error.rs
@@ -24,17 +24,17 @@ pub enum MapperError {
 #[derive(Debug, thiserror::Error)]
 pub enum ConversionError {
     #[error(transparent)]
-    MapperError(#[from] MapperError),
+    FromMapperError(#[from] MapperError),
 
     #[error(transparent)]
-    ThinEdgeJsonError(#[from] c8y_translator_lib::json::CumulocityJsonError),
+    FromCumulocityJsonError(#[from] c8y_translator_lib::json::CumulocityJsonError),
 
     #[error(transparent)]
-    ThinEdgeJsonSerializationError(#[from] ThinEdgeJsonSerializationError),
+    FromThinEdgeJsonSerializationError(#[from] ThinEdgeJsonSerializationError),
 
     #[error(transparent)]
-    ThinEdgeJsonParserError(#[from] thin_edge_json::parser::ThinEdgeJsonParserError),
+    FromThinEdgeJsonParserError(#[from] thin_edge_json::parser::ThinEdgeJsonParserError),
 
     #[error(transparent)]
-    MessageSizeExceededError(#[from] SizeThresholdExceeded),
+    SizeThresholdExceeded(#[from] SizeThresholdExceeded),
 }
diff --git a/mapper/tedge_mapper/src/sm_c8y_mapper/smartrest_deserializer.rs b/mapper/tedge_mapper/src/sm_c8y_mapper/smartrest_deserializer.rs
index b28107e5..863ca995 100644
--- a/mapper/tedge_mapper/src/sm_c8y_mapper/smartrest_deserializer.rs
+++ b/mapper/tedge_mapper/src/sm_c8y_mapper/smartrest_deserializer.rs
@@ -48,7 +48,7 @@ impl SmartRestUpdateSoftware {
 
     pub(crate) fn from_smartrest(
         &self,
-        smartrest: String,
+        smartrest: &str,
     ) -> Result<Self, SmartRestDeserializerError> {
         let mut message_id = smartrest.to_string();
         let () = message_id.truncate(3);
@@ -134,12 +134,10 @@ impl SmartRestUpdateSoftwareModule {
                     Some((v, t)) => {
                         if v.is_empty() {
                             (None, Some(t.into())) // ::debian
+                        } else if !t.is_empty() {
+                            (Some(v.into()), Some(t.into())) // 1.0::debian
                         } else {
-                            if !t.is_empty() {
-                                (Some(v.into()), Some(t.into())) // 1.0::debian
-                            } else {
-                                (Some(v.into()), None)
-                            }
+                            (Some(v.into()), None)
                         }
                     }
                     None => {
@@ -287,7 +285,7 @@ mod tests {
         let smartrest =
             String::from("528,external_id,software1,version1,url1,install,software2,,,delete");
         let update_software = SmartRestUpdateSoftware::new()
-            .from_smartrest(smartrest)
+            .from_smartrest(&smartrest)
             .unwrap();
 
         let expected_update_software = SmartRestUpdateSoftware {
@@ -316,7 +314,7 @@ mod tests {
     fn deserialize_incorrect_smartrest_message_id() {
         let smartrest = String::from("516,external_id");
         assert!(SmartRestUpdateSoftware::new()
-            .from_smartrest(smartrest)
+            .from_smartrest(&smartrest)
             .is_err());
     }
 
@@ -325,7 +323,7 @@ mod tests {
         let smartrest =
             String::from("528,external_id,software1,version1,url1,action,software2,,,remove");
         assert!(SmartRestUpdateSoftware::new()
-            .from_smartrest(smartrest)
+            .from_smartrest(&smartrest)
             .unwrap()
             .to_thin_edge_json()
             .is_err());
@@ -379,7 +377,7 @@ mod tests {
             nginx,1.21.0::docker,,install,mongodb,4.4.6::docker,,delete");
         let update_software = SmartRestUpdateSoftware::new();
         let software_update_request = update_software
-            .from_smartrest(smartrest)
+            .from_smartrest(&smartrest)
             .unwrap()
             .to_thin_edge_json_with_id("123");
         let output_json = software_update_request.unwrap().to_json().unwrap();
@@ -431,7 +429,10 @@ mod tests {
         let smartrest =
             String::from("528,external_id,software1,version1,url1,install,software2,,,delete");
         let update_software = SmartRestUpdateSoftware::new();
-        let vec = update_software.from_smartrest(smartrest).unwrap().modules();
+        let vec = update_software
+            .from_smartrest(&smartrest)
+            .unwrap()
+            .modules();
 
         let expected_vec = vec![
             SmartRestUpdateSoftwareModule {
diff --git a/mapper/thin_edge_json/examples/validate.rs b/mapper/thin_edge_json/examples/validate.rs
index 147e34ee..49560051 100644
--- a/mapper/thin_edge_json/examples/validate.rs
+++ b/mapper/thin_edge_json/examples/validate.rs
@@ -6,7 +6,7 @@ use thin_edge_json::measurement::MeasurementVisitor;
 static GLOBAL: &stats_alloc::StatsAlloc<std::alloc::System> = &stats_alloc::INSTRUMENTED_SYSTEM;
 
 fn main() -> anyhow::Result<()> {
-    let region = stats_alloc::Region::new(&GLOBAL);
+    let region = stats_alloc::Region::new(GLOBAL);
 
     let mut args = env::args();
     let _ = args.next();
diff --git a/mapper/thin_edge_json/tests/test_suite.rs b/mapper/thin_edge_json/tests/test_suite.rs
index 175b1e17..94482192 100644
--- a/mapper/thin_edge_json/tests/test_suite.rs
+++ b/mapper/thin_edge_json/tests/test_suite.rs
@@ -75,8 +75,5 @@ fn fixtures(subdir: &str) -> anyhow::Result<Vec<DirEntry>> {
 }
 
 fn is_fixture(e: &DirEntry) -> bool {
-    match (e.file_type().is_file(), e.path().extension()) {
-        (true, Some(ext)) if ext == "json" => true,
-        _ => false,
-    }
+    matches!((e.file_type().is_file(), e.path().extension()), (true, Some(ext)) if ext == "json")
 }
diff --git a/sm/json_sm/src/messages.rs b/sm/json_sm/src/messages.rs
index 5161ec0b..e23303d0 100644
--- a/sm/json_sm/src/messages.rs
+++ b/sm/json_sm/src/messages.rs
@@ -90,7 +90,7 @@ impl SoftwareUpdateRequest {
             .module()
             .module_type
             .clone()
-            .unwrap_or(SoftwareModule::default_type());
+            .unwrap_or_else(SoftwareModule::default_type);
 
         if let Some(list) = self
             .update_list
@@ -366,7 +366,7 @@ impl SoftwareRequestResponse {
         }
     }
 
-    pub fn set_reason_errors(&mut self, errors: &Vec<SoftwareError>) {
+    pub fn set_reason_errors(&mut self, errors: &[SoftwareError]) {
         let mut count = 0;
         let mut failed_package = String::new();
         let mut failed_install = String::new();
@@ -376,26 +376,26 @@ impl SoftwareRequestResponse {
             count += 1;
             match error {
                 SoftwareError::Install { module, .. } => {
-                    failed_install.push_str(" ");
+                    failed_install.push(' ');
                     failed_install.push_str(&module.name);
                 }
                 SoftwareError::Remove { module, .. } => {
-                    failed_remove.push_str(" ");
+                    failed_remove.push(' ');
                     failed_remove.push_str(&module.name);
                 }
                 SoftwareError::Prepare { software_type, .. } => {
-                    failed_package.push_str(" ");
-                    failed_package.push_str(&software_type);
+                    failed_package.push(' ');
+                    failed_package.push_str(software_type);
                 }
                 SoftwareError::Finalize { softwar