Clippy lints fixes for latest code (#433)

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

12 files changed, 33 insertions, 32 deletions

diff --git a/tedge/src/cli/certificate/cli.rs b/tedge/src/cli/certificate/cli.rs
index c3557072..7ef78fb5 100644
--- a/tedge/src/cli/certificate/cli.rs
+++ b/tedge/src/cli/certificate/cli.rs
@@ -35,7 +35,7 @@ impl BuildCommand for TEdgeCertCli {
                     id,
                     cert_path: config.query(DeviceCertPathSetting)?,
                     key_path: config.query(DeviceKeyPathSetting)?,
-                    user_manager: context.user_manager.clone(),
+                    user_manager: context.user_manager,
                 };
                 cmd.into_boxed()
             }
@@ -51,7 +51,7 @@ impl BuildCommand for TEdgeCertCli {
                 let cmd = RemoveCertCmd {
                     cert_path: config.query(DeviceCertPathSetting)?,
                     key_path: config.query(DeviceKeyPathSetting)?,
-                    user_manager: context.user_manager.clone(),
+                    user_manager: context.user_manager,
                 };
                 cmd.into_boxed()
             }
diff --git a/tedge/src/cli/certificate/create.rs b/tedge/src/cli/certificate/create.rs
index e198cb22..560c2a8f 100644
--- a/tedge/src/cli/certificate/create.rs
+++ b/tedge/src/cli/certificate/create.rs
@@ -44,7 +44,7 @@ impl CreateCertCmd {
         validate_parent_dir_exists(&self.cert_path).map_err(CertError::CertPathError)?;
         validate_parent_dir_exists(&self.key_path).map_err(CertError::KeyPathError)?;
 
-        let cert = KeyCertPair::new_selfsigned_certificate(&config, &self.id)?;
+        let cert = KeyCertPair::new_selfsigned_certificate(config, &self.id)?;
 
         // Creating files with permission 644
         let mut cert_file = create_new_file(&self.cert_path)
diff --git a/tedge/src/cli/connect/command.rs b/tedge/src/cli/connect/command.rs
index 56d7a566..4d2b51a5 100644
--- a/tedge/src/cli/connect/command.rs
+++ b/tedge/src/cli/connect/command.rs
@@ -166,7 +166,7 @@ impl ConnectCommand {
 
     fn check_connection(&self, config: &TEdgeConfig) -> Result<DeviceStatus, ConnectError> {
         let port = config.query(MqttPortSetting)?.into();
-        let device_id: String = config.query(DeviceIdSetting)?.into();
+        let device_id = config.query(DeviceIdSetting)?;
         println!(
             "Sending packets to check connection. This may take up to {} seconds.\n",
             WAIT_FOR_CHECK_SECONDS
@@ -240,7 +240,7 @@ fn check_device_status_c8y(port: u16, device_id: &str) -> Result<DeviceStatus, C
             }
         }
     }
-    return Ok(DeviceStatus::MightBeNew);
+    Ok(DeviceStatus::MightBeNew)
 }
 
 fn create_device(port: u16, device_id: &str) -> Result<DeviceStatus, ConnectError> {
@@ -277,7 +277,7 @@ fn create_device(port: u16, device_id: &str) -> Result<DeviceStatus, ConnectErro
             }
             Ok(Event::Incoming(Packet::Publish(response))) => {
                 // We got a response
-                if &response.payload == REGISTRATION_ERROR {
+                if response.payload == REGISTRATION_ERROR {
                     return Ok(DeviceStatus::AlreadyExists);
                 }
             }
diff --git a/tedge/src/cli/mqtt/cli.rs b/tedge/src/cli/mqtt/cli.rs
index c90ff778..fa977a2a 100644
--- a/tedge/src/cli/mqtt/cli.rs
+++ b/tedge/src/cli/mqtt/cli.rs
@@ -77,12 +77,12 @@ impl BuildCommand for TEdgeMqttCli {
 }
 
 fn parse_qos(src: &str) -> Result<QoS, MqttError> {
-    let int_val: u8 = src.parse().map_err(|_| MqttError::InvalidQoSError)?;
+    let int_val: u8 = src.parse().map_err(|_| MqttError::InvalidQoS)?;
     match int_val {
         0 => Ok(QoS::AtMostOnce),
         1 => Ok(QoS::AtLeastOnce),
         2 => Ok(QoS::ExactlyOnce),
-        _ => Err(MqttError::InvalidQoSError),
+        _ => Err(MqttError::InvalidQoS),
     }
 }
 
diff --git a/tedge/src/cli/mqtt/error.rs b/tedge/src/cli/mqtt/error.rs
index fe209154..54763a42 100644
--- a/tedge/src/cli/mqtt/error.rs
+++ b/tedge/src/cli/mqtt/error.rs
@@ -1,17 +1,17 @@
 #[derive(thiserror::Error, Debug)]
 pub enum MqttError {
     #[error("MQTT error")]
-    ConnectError(#[from] rumqttc::ClientError),
+    FromRumqttClient(#[from] rumqttc::ClientError),
 
     #[error("I/O error")]
-    IoError(#[from] std::io::Error),
+    FromIo(#[from] std::io::Error),
 
     #[error("Received message is not UTF-8 format")]
-    Utf8Error(#[from] std::str::Utf8Error),
+    FromUtf8(#[from] std::str::Utf8Error),
 
     #[error("The input QoS should be 0, 1, or 2")]
-    InvalidQoSError,
+    InvalidQoS,
 
     #[error("MQTT connection error: {0}\n\nHint: Is MQTT server running?")]
-    ServerError(String),
+    ServerConnection(String),
 }
diff --git a/tedge/src/cli/mqtt/publish.rs b/tedge/src/cli/mqtt/publish.rs
index c1a1dfa1..42eca6bc 100644
--- a/tedge/src/cli/mqtt/publish.rs
+++ b/tedge/src/cli/mqtt/publish.rs
@@ -64,11 +64,11 @@ fn publish(cmd: &MqttPublishCommand) -> Result<(), MqttError> {
                 }
             }
             Ok(Event::Incoming(Incoming::Disconnect)) => {
-                any_error = Some(MqttError::ServerError("Disconnected".to_string()));
+                any_error = Some(MqttError::ServerConnection("Disconnected".to_string()));
                 break;
             }
             Err(err) => {
-                any_error = Some(MqttError::ServerError(err.to_string()));
+                any_error = Some(MqttError::ServerConnection(err.to_string()));
                 break;
             }
             _ => {}
diff --git a/tedge/src/cli/mqtt/subscribe.rs b/tedge/src/cli/mqtt/subscribe.rs
index b7278c75..8b7abe88 100644
--- a/tedge/src/cli/mqtt/subscribe.rs
+++ b/tedge/src/cli/mqtt/subscribe.rs
@@ -41,7 +41,7 @@ fn subscribe(cmd: &MqttSubscribeCommand) -> Result<(), MqttError> {
                     .payload
                     .strip_suffix(&[0])
                     .unwrap_or(&message.payload);
-                match std::str::from_utf8(&payload) {
+                match std::str::from_utf8(payload) {
                     Ok(payload) => {
                         if cmd.hide_topic {
                             println!("{}", &payload);
@@ -65,7 +65,7 @@ fn subscribe(cmd: &MqttSubscribeCommand) -> Result<(), MqttError> {
             Err(err) => {
                 let err_msg = err.to_string();
                 if err_msg.contains("I/O: Connection refused (os error 111)") {
-                    return Err(MqttError::ServerError(err_msg));
+                    return Err(MqttError::ServerConnection(err_msg));
                 }
 
                 eprintln!("ERROR: {}", err_msg);
diff --git a/tedge/src/error.rs b/tedge/src/error.rs
index 41683bf2..3e4bb431 100644
--- a/tedge/src/error.rs
+++ b/tedge/src/error.rs
@@ -1,23 +1,23 @@
 #[derive(thiserror::Error, Debug)]
 pub enum TEdgeError {
     #[error("TOML parse error")]
-    TomlParseError(#[from] toml::de::Error),
+    FromTomlParse(#[from] toml::de::Error),
 
     #[error("TOML serialization error")]
-    InvalidTomlError(#[from] toml::ser::Error),
+    FromInvalidToml(#[from] toml::ser::Error),
 
     #[error("I/O error")]
-    IoError(#[from] std::io::Error),
+    FromIo(#[from] std::io::Error),
 
     #[error(transparent)]
-    PathsError(#[from] tedge_utils::paths::PathsError),
+    FromPaths(#[from] tedge_utils::paths::PathsError),
 
     #[error(transparent)]
-    TEdgeConfigError(#[from] tedge_config::TEdgeConfigError),
+    FromTEdgeConfig(#[from] tedge_config::TEdgeConfigError),
 
     #[error(transparent)]
-    TEdgeConfigSettingError(#[from] tedge_config::ConfigSettingError),
+    FromTEdgeConfigSetting(#[from] tedge_config::ConfigSettingError),
 
     #[error(transparent)]
-    MqttClientError(#[from] rumqttc::ClientError),
+    FromRumqttClient(#[from] rumqttc::ClientError),
 }
diff --git a/tedge/src/system_services/managers/bsd.rs b/tedge/src/system_services/managers/bsd.rs
index c7780fd6..86e732ae 100644
--- a/tedge/src/system_services/managers/bsd.rs
+++ b/tedge/src/system_services/managers/bsd.rs
@@ -1,6 +1,5 @@
-use crate::system_services::SystemService::*;
 use crate::system_services::*;
-use std::process::*;
+use std::process::ExitStatus;
 use tedge_users::{UserManager, ROOT_USER};
 
 /// Service manager that uses `service(8)` as found on FreeBSD to control system services.
diff --git a/tedge/src/system_services/managers/null.rs b/tedge/src/system_services/managers/null.rs
index 947fbb1a..c3416d8b 100644
--- a/tedge/src/system_services/managers/null.rs
+++ b/tedge/src/system_services/managers/null.rs
@@ -1,4 +1,4 @@
-use crate::system_services::*;
+use crate::system_services::{SystemService, SystemServiceError, SystemServiceManager};
 
 /// A system service manager that always fails.
 #[derive(Debug)]
diff --git a/tedge/src/system_services/managers/openrc.rs b/tedge/src/system_services/managers/openrc.rs
index 19d46cc5..0c3f1b42 100644
--- a/tedge/src/system_services/managers/openrc.rs
+++ b/tedge/src/system_services/managers/openrc.rs
@@ -1,5 +1,7 @@
-use crate::system_services::*;
-use std::process::*;
+use crate::system_services::{
+    CommandBuilder, OpenRcServiceError, SystemService, SystemServiceError, SystemServiceManager,
+};
+use std::process::ExitStatus;
 use tedge_users::{UserManager, ROOT_USER};
 
 /// Service manager that uses [OpenRC][1] to control system services.
diff --git a/tedge/tests/main.rs b/tedge/tests/main.rs
index 5adb42ad..d561222e 100644
--- a/tedge/tests/main.rs
+++ b/tedge/tests/main.rs
@@ -325,7 +325,7 @@ mod tests {
         assert!(cert_path.contains(".tedge"));
 
         for key in get_tedge_config_keys() {
-            assert_eq!(true, output_str.contains(key));
+            assert!(output_str.contains(key));
         }
     }
 
@@ -341,9 +341,9 @@ mod tests {
         let output_str = String::from_utf8(output.clone().stdout).unwrap();
 
         for key in get_tedge_config_keys() {
-            assert_eq!(true, output_str.contains(key));
+            assert!(output_str.contains(key));
         }
-        assert_eq!(true, output_str.contains("Example"));
+        assert!(output_str.contains("Example"));
     }
 
     fn tedge_command_with_test_home<I, S>(