Merge pull request #894 from matthiasbeyer/clippy-fixes-tedge

Clippy fixes for: tedge

5 files changed, 20 insertions, 40 deletions

diff --git a/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs b/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs
index 049429b2..d080eda2 100644
--- a/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs
+++ b/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs
@@ -24,7 +24,7 @@ pub fn create_device_with_direct_connection(
     const DEVICE_CREATE_ERROR_TOPIC: &str = "s/e";
 
     let address = bridge_config.address.clone();
-    let host: Vec<&str> = address.split(":").collect();
+    let host: Vec<&str> = address.split(':').collect();
 
     let mut mqtt_options = MqttOptions::new(bridge_config.remote_clientid.clone(), host[0], 8883);
     mqtt_options.set_keep_alive(std::time::Duration::from_secs(5));
@@ -53,7 +53,7 @@ pub fn create_device_with_direct_connection(
                 publish_device_create_message(
                     &mut client,
                     &bridge_config.remote_clientid.clone(),
-                    &device_type,
+                    device_type,
                 )?;
             }
             Ok(Event::Incoming(Packet::Publish(response))) => {
@@ -69,7 +69,7 @@ pub fn create_device_with_direct_connection(
                     publish_device_create_message(
                         &mut client,
                         &bridge_config.remote_clientid.clone(),
-                        &device_type,
+                        device_type,
                     )?;
                     device_create_try += 1;
                 } else {
@@ -117,10 +117,12 @@ fn load_root_certs(
         let file = file_entry?;
         let f = File::open(file.path())?;
         let mut rd = BufReader::new(f);
-        let _ = root_store
-            .add_pem_file(&mut rd)
-            .map(|_| ())
-            .map_err(|()| Error::new(ErrorKind::InvalidData, format!("could not load PEM file")));
+        let _ = root_store.add_pem_file(&mut rd).map(|_| ()).map_err(|()| {
+            Error::new(
+                ErrorKind::InvalidData,
+                "could not load PEM file".to_string(),
+            )
+        });
     }
     Ok(())
 }
@@ -140,10 +142,8 @@ fn parse_pkcs8_key(
     let f = File::open(&key_file)?;
     let mut key_reader = BufReader::new(f);
     match pkcs8_private_keys(&mut key_reader) {
-        Ok(key) if key.len() > 0 => return Ok(key[0].clone()),
-        _ => {
-            return Err(ConnectError::UnknownPrivateKeyFormat);
-        }
+        Ok(key) if !key.is_empty() => Ok(key[0].clone()),
+        _ => Err(ConnectError::UnknownPrivateKeyFormat),
     }
 }
 
@@ -153,10 +153,8 @@ fn parse_rsa_key(
     let f = File::open(&key_file)?;
     let mut key_reader = BufReader::new(f);
     match rsa_private_keys(&mut key_reader) {
-        Ok(key) if key.len() > 0 => return Ok(key[0].clone()),
-        _ => {
-            return Err(ConnectError::UnknownPrivateKeyFormat);
-        }
+        Ok(key) if !key.is_empty() => Ok(key[0].clone()),
+        _ => Err(ConnectError::UnknownPrivateKeyFormat),
     }
 }
 
@@ -165,14 +163,7 @@ fn read_cert_chain(
 ) -> Result<Vec<rustls_0_19::Certificate>, ConnectError> {
     let f = File::open(cert_file)?;
     let mut cert_reader = BufReader::new(f);
-    let result = certs(&mut cert_reader);
-    let cert_chain: Vec<rustls_0_19::Certificate> = match result {
-        Ok(cert) => cert,
-        Err(_) => {
-            return Err(ConnectError::RumqttcCertificate);
-        }
-    };
-    Ok(cert_chain)
+    certs(&mut cert_reader).map_err(|_| ConnectError::RumqttcCertificate)
 }
 
 #[cfg(test)]
diff --git a/crates/core/tedge/src/cli/connect/command.rs b/crates/core/tedge/src/cli/connect/command.rs
index a76dcb3d..253fd813 100644
--- a/crates/core/tedge/src/cli/connect/command.rs
+++ b/crates/core/tedge/src/cli/connect/command.rs
@@ -75,11 +75,11 @@ impl Command for ConnectCommand {
             if self.check_if_bridge_exists(&br_config) {
                 return match self.check_connection(&config) {
                     Ok(DeviceStatus::AlreadyExists) => {
-                        let cloud = br_config.cloud_name.clone();
+                        let cloud = br_config.cloud_name;
                         println!("Connection check to {} cloud is successful.\n", cloud);
                         Ok(())
                     }
-                    _ => {
+                    Ok(DeviceStatus::Unknown) | Err(_) => {
                         println!(
                             "Connection check to {} cloud failed.\n",
                             self.cloud.as_str()
@@ -407,7 +407,7 @@ fn new_bridge(
         let () = c8y_direct_connection::create_device_with_direct_connection(
             user_manager,
             bridge_config,
-            &device_type,
+            device_type,
         )?;
     }
 
diff --git a/crates/core/tedge/src/cli/connect/common_mosquitto_config.rs b/crates/core/tedge/src/cli/connect/common_mosquitto_config.rs
index a23d6396..7fd9a28b 100644
--- a/crates/core/tedge/src/cli/connect/common_mosquitto_config.rs
+++ b/crates/core/tedge/src/cli/connect/common_mosquitto_config.rs
@@ -110,11 +110,7 @@ impl CommonMosquittoConfig {
         for log_type in &self.log_types {
             writeln!(writer, "log_type {}", log_type)?;
         }
-        writeln!(
-            writer,
-            "message_size_limit {}",
-            self.message_size_limit.to_string()
-        )?;
+        writeln!(writer, "message_size_limit {}", self.message_size_limit)?;
 
         self.internal_listener.write(writer)?;
         self.external_listener.write(writer)?;
diff --git a/crates/core/tedge/src/error.rs b/crates/core/tedge/src/error.rs
index 46aa68d3..9bc8c224 100644
--- a/crates/core/tedge/src/error.rs
+++ b/crates/core/tedge/src/error.rs
@@ -1,6 +1,7 @@
 use crate::system_services;
 
 #[derive(thiserror::Error, Debug)]
+#[allow(clippy::enum_variant_names)]
 pub enum TEdgeError {
     #[error("TOML parse error")]
     FromTomlParse(#[from] toml::de::Error),
diff --git a/crates/core/tedge/src/system_services/managers/config.rs b/crates/core/tedge/src/system_services/managers/config.rs
index af495f02..252bbaf7 100644
--- a/crates/core/tedge/src/system_services/managers/config.rs
+++ b/crates/core/tedge/src/system_services/managers/config.rs
@@ -5,7 +5,7 @@ use std::path::PathBuf;
 
 pub const SERVICE_CONFIG_FILE: &str = "system.toml";
 
-#[derive(Deserialize, Debug, PartialEq)]
+#[derive(Deserialize, Debug, Default, PartialEq)]
 pub struct SystemConfig {
     pub(crate) init: InitConfig,
 }
@@ -36,14 +36,6 @@ impl Default for InitConfig {
     }
 }
 
-impl Default for SystemConfig {
-    fn default() -> Self {
-        Self {
-            init: InitConfig::default(),
-        }
-    }
-}
-
 impl SystemConfig {
     pub fn try_new(config_root: PathBuf) -> Result<Self, SystemServiceError> {
         let config_path = config_root.join(SERVICE_CONFIG_FILE);