Merge pull request #1349 from matthiasbeyer/clippy-fixes

Clippy fixes

27 files changed, 78 insertions, 86 deletions

diff --git a/crates/common/download/src/download.rs b/crates/common/download/src/download.rs
index 692cb1a7..8350cf49 100644
--- a/crates/common/download/src/download.rs
+++ b/crates/common/download/src/download.rs
@@ -12,7 +12,7 @@ use std::{
     time::Duration,
 };
 
-#[derive(Debug, Clone, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Clone, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 #[serde(deny_unknown_fields)]
 pub struct DownloadInfo {
@@ -47,7 +47,7 @@ impl DownloadInfo {
     }
 }
 
-#[derive(Debug, Clone, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(rename_all = "camelCase")]
 #[serde(deny_unknown_fields)]
 pub enum Auth {
diff --git a/crates/common/flockfile/src/unix.rs b/crates/common/flockfile/src/unix.rs
index 5980397f..ce0e29f0 100644
--- a/crates/common/flockfile/src/unix.rs
+++ b/crates/common/flockfile/src/unix.rs
@@ -110,22 +110,15 @@ pub fn check_another_instance_is_not_running(
     app_name: &str,
     run_dir: &Path,
 ) -> Result<Flockfile, FlockfileError> {
-    match Flockfile::new_lock(
-        run_dir
-            .join(format!("{}{}.lock", LOCK_CHILD_DIRECTORY, app_name))
-            .as_path(),
-    ) {
-        Ok(file) => Ok(file),
-        Err(err) => {
-            return match &err {
-                FlockfileError::FromIo { path, .. } | FlockfileError::FromNix { path, .. } => {
-                    error!("Another instance of {} is running.", app_name);
-                    error!("Lock file path: {}", path.as_path().to_str().unwrap());
-                    Err(err)
-                }
-            }
+    let lock_path = run_dir.join(format!("{}{}.lock", LOCK_CHILD_DIRECTORY, app_name));
+
+    Flockfile::new_lock(lock_path.as_path()).map_err(|err| match &err {
+        FlockfileError::FromIo { path, .. } | FlockfileError::FromNix { path, .. } => {
+            error!("Another instance of {} is running.", app_name);
+            error!("Lock file path: {}", path.as_path().to_str().unwrap());
+            err
         }
-    }
+    })
 }
 
 #[cfg(test)]
diff --git a/crates/common/logged_command/src/logged_command.rs b/crates/common/logged_command/src/logged_command.rs
index e276b495..8854a715 100644
--- a/crates/common/logged_command/src/logged_command.rs
+++ b/crates/common/logged_command/src/logged_command.rs
@@ -69,8 +69,9 @@ impl LoggedCommand {
     }
 
     pub fn arg(&mut self, arg: impl AsRef<OsStr>) -> &mut LoggedCommand {
+        use std::fmt::Write;
         // The arguments are displayed as debug, to be properly quoted and distinguished from each other.
-        self.command_line.push_str(&format!(" {:?}", arg.as_ref()));
+        let _ = write!(self.command_line, " {:?}", arg.as_ref());
         self.command.arg(arg);
         self
     }
diff --git a/crates/core/agent_interface/src/error.rs b/crates/core/agent_interface/src/error.rs
index ea4c2c49..ed369a5b 100644
--- a/crates/core/agent_interface/src/error.rs
+++ b/crates/core/agent_interface/src/error.rs
@@ -9,7 +9,7 @@ pub enum TopicError {
     UnknownTopic { topic: String },
 }
 
-#[derive(thiserror::Error, Debug, Clone, Deserialize, Serialize, PartialEq)]
+#[derive(thiserror::Error, Debug, Clone, Deserialize, Serialize, Eq, PartialEq)]
 pub enum SoftwareError {
     #[error("DownloadError error: {reason:?} for {url:?}")]
     DownloadError { reason: String, url: String },
diff --git a/crates/core/agent_interface/src/messages.rs b/crates/core/agent_interface/src/messages.rs
index e124bf78..fa1a3962 100644
--- a/crates/core/agent_interface/src/messages.rs
+++ b/crates/core/agent_interface/src/messages.rs
@@ -34,7 +34,7 @@ pub const fn control_filter_topic() -> &'static str {
 }
 
 /// Message payload definition for SoftwareList request.
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 #[serde(deny_unknown_fields)]
 #[serde(rename_all = "camelCase")]
 pub struct SoftwareListRequest {
@@ -61,7 +61,7 @@ impl SoftwareListRequest {
 }
 
 /// Message payload definition for SoftwareUpdate request.
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 #[serde(deny_unknown_fields)]
 #[serde(rename_all = "camelCase")]
 pub struct SoftwareUpdateRequest {
@@ -168,7 +168,7 @@ impl SoftwareUpdateRequest {
 }
 
 /// Sub list of modules grouped by plugin type.
-#[derive(Debug, Clone, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Clone, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 #[serde(deny_unknown_fields)]
 pub struct SoftwareRequestResponseSoftwareList {
@@ -178,7 +178,7 @@ pub struct SoftwareRequestResponseSoftwareList {
 }
 
 /// Possible statuses for result of Software operation.
-#[derive(Debug, Deserialize, Serialize, PartialEq, Copy, Clone)]
+#[derive(Debug, Deserialize, Serialize, PartialEq, Copy, Eq, Clone)]
 #[serde(rename_all = "camelCase")]
 pub enum OperationStatus {
     Successful,
@@ -187,7 +187,7 @@ pub enum OperationStatus {
 }
 
 /// Message payload definition for SoftwareList response.
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SoftwareListResponse {
     #[serde(flatten)]
     response: SoftwareRequestResponse,
@@ -239,7 +239,7 @@ impl SoftwareListResponse {
 }
 
 /// Message payload definition for SoftwareUpdate response.
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SoftwareUpdateResponse {
     #[serde(flatten)]
     response: SoftwareRequestResponse,
@@ -301,7 +301,7 @@ impl SoftwareUpdateResponse {
 }
 
 /// Variants represent Software Operations Supported actions.
-#[derive(Debug, Clone, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub enum SoftwareModuleAction {
     Install,
@@ -309,7 +309,7 @@ pub enum SoftwareModuleAction {
 }
 
 /// Software module payload definition.
-#[derive(Debug, Clone, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Clone, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 #[serde(deny_unknown_fields)]
 pub struct SoftwareModuleItem {
@@ -330,7 +330,7 @@ pub struct SoftwareModuleItem {
 }
 
 /// Software Operation Response payload format.
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct SoftwareRequestResponse {
     pub id: String,
@@ -462,14 +462,14 @@ impl From<SoftwareError> for Option<SoftwareModuleItem> {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub enum RestartOperation {
     Request(RestartOperationRequest),
     Response(RestartOperationResponse),
 }
 
 /// Message payload definition for restart operation request.
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 #[serde(deny_unknown_fields)]
 #[serde(rename_all = "camelCase")]
 pub struct RestartOperationRequest {
@@ -495,7 +495,7 @@ impl RestartOperationRequest {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct RestartOperationResponse {
     pub id: String,
     pub status: OperationStatus,
diff --git a/crates/core/agent_interface/src/software.rs b/crates/core/agent_interface/src/software.rs
index dea512c5..7253580d 100644
--- a/crates/core/agent_interface/src/software.rs
+++ b/crates/core/agent_interface/src/software.rs
@@ -9,7 +9,7 @@ pub type SoftwareVersion = String;
 
 pub const DEFAULT: &str = "default";
 
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Clone, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SoftwareModule {
     #[serde(default)]
     pub module_type: Option<SoftwareType>,
@@ -61,7 +61,7 @@ impl SoftwareModule {
     }
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Clone, Deserialize, Serialize, Eq, PartialEq)]
 pub enum SoftwareModuleUpdate {
     Install { module: SoftwareModule },
     Remove { module: SoftwareModule },
diff --git a/crates/core/agent_interface/src/topic.rs b/crates/core/agent_interface/src/topic.rs
index a799aeed..f34e0afb 100644
--- a/crates/core/agent_interface/src/topic.rs
+++ b/crates/core/agent_interface/src/topic.rs
@@ -1,6 +1,6 @@
 use crate::error::TopicError;
 use std::convert::TryFrom;
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum ResponseTopic {
     SoftwareListResponse,
     SoftwareUpdateResponse,
@@ -40,7 +40,7 @@ impl TryFrom<&str> for ResponseTopic {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum RequestTopic {
     SoftwareListRequest,
     SoftwareUpdateRequest,
diff --git a/crates/core/c8y_api/src/json_c8y.rs b/crates/core/c8y_api/src/json_c8y.rs
index d50559a1..868e2c0c 100644
--- a/crates/core/c8y_api/src/json_c8y.rs
+++ b/crates/core/c8y_api/src/json_c8y.rs
@@ -31,7 +31,7 @@ pub struct C8yCreateEvent {
     pub extras: HashMap<String, Value>,
 }
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]
 /// used to retrieve the id of a log event
 pub struct C8yEventResponse {
@@ -57,7 +57,7 @@ impl InternalIdResponse {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct C8ySoftwareModuleItem {
     pub name: String,
     pub version: Option<String>,
@@ -87,7 +87,7 @@ impl From<SoftwareModule> for C8ySoftwareModuleItem {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct C8yUpdateSoftwareListResponse {
     #[serde(rename = "c8y_SoftwareList")]
diff --git a/crates/core/c8y_smartrest/src/operations.rs b/crates/core/c8y_smartrest/src/operations.rs
index ea0202b7..536526c7 100644
--- a/crates/core/c8y_smartrest/src/operations.rs
+++ b/crates/core/c8y_smartrest/src/operations.rs
@@ -11,7 +11,7 @@ use serde::Deserialize;
 /// Each operation is a file name in one of the subdirectories
 /// The file name is the operation name
 
-#[derive(Debug, Clone, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Deserialize, Eq, PartialEq)]
 #[serde(rename_all = "snake_case")]
 pub struct OnMessageExec {
     command: Option<String>,
@@ -20,7 +20,7 @@ pub struct OnMessageExec {
     user: Option<String>,
 }
 
-#[derive(Debug, Clone, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Deserialize, Eq, PartialEq)]
 #[serde(rename_all = "lowercase")]
 pub struct Operation {
     #[serde(skip)]
diff --git a/crates/core/c8y_smartrest/src/smartrest_deserializer.rs b/crates/core/c8y_smartrest/src/smartrest_deserializer.rs
index 63b031fc..d29f0fdc 100644
--- a/crates/core/c8y_smartrest/src/smartrest_deserializer.rs
+++ b/crates/core/c8y_smartrest/src/smartrest_deserializer.rs
@@ -29,14 +29,14 @@ impl TryFrom<String> for CumulocitySoftwareUpdateActions {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SmartRestUpdateSoftware {
     pub message_id: String,
     pub external_id: String,
     pub update_list: Vec<SmartRestUpdateSoftwareModule>,
 }
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SmartRestUpdateSoftwareModule {
     pub software: String,
     pub version: Option<String>,
@@ -176,9 +176,7 @@ where
     let date_string_end = &date_string.split('+').last();
     date_string = match date_string_end {
         Some(string) if !string.contains(':') => {
-            date_string[0..str_size - 2].to_string()
-                + ":"
-                + &date_string[str_size - 2..str_size].to_string()
+            date_string[0..str_size - 2].to_string() + ":" + &date_string[str_size - 2..str_size]
         }
         _ => date_string,
     };
@@ -211,7 +209,7 @@ pub enum SmartRestVariant {
     SmartRestLogRequest,
 }
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SmartRestLogRequest {
     pub message_id: String,
     pub device: String,
@@ -226,7 +224,7 @@ pub struct SmartRestLogRequest {
 
 impl SmartRestRequestGeneric for SmartRestLogRequest {}
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SmartRestRestartRequest {
     pub message_id: String,
     pub device: String,
@@ -234,7 +232,7 @@ pub struct SmartRestRestartRequest {
 
 impl SmartRestRequestGeneric for SmartRestRestartRequest {}
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SmartRestConfigUploadRequest {
     pub message_id: String,
     pub device: String,
@@ -243,7 +241,7 @@ pub struct SmartRestConfigUploadRequest {
 
 impl SmartRestRequestGeneric for SmartRestConfigUploadRequest {}
 
-#[derive(Debug, Deserialize, Serialize, PartialEq, Clone)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq, Clone)]
 pub struct SmartRestConfigDownloadRequest {
     pub message_id: String,
     pub device: String,
@@ -255,7 +253,7 @@ impl SmartRestRequestGeneric for SmartRestConfigDownloadRequest {}
 
 type JwtToken = String;
 
-#[derive(Debug, Deserialize, PartialEq)]
+#[derive(Debug, Deserialize, Eq, PartialEq)]
 pub struct SmartRestJwtResponse {
     id: u16,
     token: JwtToken,
diff --git a/crates/core/c8y_smartrest/src/smartrest_serializer.rs b/crates/core/c8y_smartrest/src/smartrest_serializer.rs
index 4581a2cf..abac4e6e 100644
--- a/crates/core/c8y_smartrest/src/smartrest_serializer.rs
+++ b/crates/core/c8y_smartrest/src/smartrest_serializer.rs
@@ -37,7 +37,7 @@ where
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SmartRestSetSupportedLogType {
     pub message_id: &'static str,
     pub supported_operations: Vec<String>,
@@ -54,7 +54,7 @@ impl From<Vec<String>> for SmartRestSetSupportedLogType {
 
 impl<'a> SmartRestSerializer<'a> for SmartRestSetSupportedLogType {}
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SmartRestSetSupportedOperations<'a> {
     pub message_id: &'static str,
     pub supported_operations: Vec<&'a str>,
@@ -75,14 +75,14 @@ impl<'a> SmartRestSetSupportedOperations<'a> {
 
 impl<'a> SmartRestSerializer<'a> for SmartRestSetSupportedOperations<'a> {}
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SmartRestSoftwareModuleItem {
     pub software: String,
     pub version: Option<String>,
     pub url: Option<String>,
 }
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SmartRestGetPendingOperations {
     pub id: &'static str,
 }
@@ -95,7 +95,7 @@ impl Default for SmartRestGetPendingOperations {
 
 impl<'a> SmartRestSerializer<'a> for SmartRestGetPendingOperations {}
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SmartRestSetOperationToExecuting {
     pub message_id: &'static str,
     pub operation: &'static str,
@@ -123,7 +123,7 @@ impl SmartRestSetOperationToExecuting {
 
 impl<'a> SmartRestSerializer<'a> for SmartRestSetOperationToExecuting {}
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SmartRestSetOperationToSuccessful {
     pub message_id: &'static str,
     pub operation: &'static str,
@@ -160,7 +160,7 @@ impl SmartRestSetOperationToSuccessful {
 
 impl<'a> SmartRestSerializer<'a> for SmartRestSetOperationToSuccessful {}
 
-#[derive(Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)]
 pub struct SmartRestSetOperationToFailed {
     pub message_id: &'static str,
     pub operation: &'static str,
diff --git a/crates/core/c8y_smartrest/src/topic.rs b/crates/core/c8y_smartrest/src/topic.rs
index 7df4f5af..d8faebb7 100644
--- a/crates/core/c8y_smartrest/src/topic.rs
+++ b/crates/core/c8y_smartrest/src/topic.rs
@@ -3,7 +3,7 @@ use agent_interface::TopicError;
 use mqtt_channel::MqttError;
 use mqtt_channel::Topic;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum C8yTopic {
     SmartRestRequest,
     SmartRestResponse,
@@ -59,7 +59,7 @@ impl TryFrom<Topic> for C8yTopic {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum MapperSubscribeTopic {
     C8yTopic(C8yTopic),
     ResponseTopic(ResponseTopic),
diff --git a/crates/core/c8y_translator/src/serializer.rs b/crates/core/c8y_translator/src/serializer.rs
index fb2d788a..bf5aa3cf 100644
--- a/crates/core/c8y_translator/src/serializer.rs
+++ b/crates/core/c8y_translator/src/serializer.rs
@@ -18,7 +18,7 @@ pub enum C8yJsonSerializationError {
     JsonWriterError(#[from] JsonWriterError),
 }
 
-#[derive(thiserror::Error, Debug, PartialEq)]
+#[derive(thiserror::Error, Debug, Eq, PartialEq)]
 pub enum MeasurementStreamError {
     #[error("Unexpected time stamp within a group")]
     UnexpectedTimestamp,
diff --git a/crates/core/tedge/src/cli/connect/bridge_config.rs b/crates/core/tedge/src/cli/connect/bridge_config.rs
index f843c7fe..9f02bab0 100644
--- a/crates/core/tedge/src/cli/connect/bridge_config.rs
+++ b/crates/core/tedge/src/cli/connect/bridge_config.rs
@@ -3,7 +3,7 @@ use crate::cli::connect::ConnectError;
 use tedge_config::FilePath;
 use url::Url;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Eq, PartialEq)]
 pub struct BridgeConfig {
     pub cloud_name: String,
     pub config_file: String,
diff --git a/crates/core/tedge/src/cli/connect/bridge_config_azure.rs b/crates/core/tedge/src/cli/connect/bridge_config_azure.rs
index 4182335e..4e0b2a76 100644
--- a/crates/core/tedge/src/cli/connect/bridge_config_azure.rs
+++ b/crates/core/tedge/src/cli/connect/bridge_config_azure.rs
@@ -1,7 +1,7 @@
 use crate::cli::connect::BridgeConfig;
 use tedge_config::{ConnectUrl, FilePath};
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Eq, PartialEq)]
 pub struct BridgeConfigAzureParams {
     pub connect_url: ConnectUrl,
     pub mqtt_tls_port: u16,
diff --git a/crates/core/tedge/src/cli/connect/bridge_config_c8y.rs b/crates/core/tedge/src/cli/connect/bridge_config_c8y.rs
index 31330598..730daab9 100644
--- a/crates/core/tedge/src/cli/connect/bridge_config_c8y.rs
+++ b/crates/core/tedge/src/cli/connect/bridge_config_c8y.rs
@@ -1,7 +1,7 @@
 use crate::cli::connect::BridgeConfig;
 use tedge_config::{ConnectUrl, FilePath, TemplatesSet};
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Eq, PartialEq)]
 pub struct BridgeConfigC8yParams {
     pub connect_url: ConnectUrl,
     pub mqtt_tls_port: u16,
diff --git a/crates/core/tedge/src/cli/connect/cli.rs b/crates/core/tedge/src/cli/connect/cli.rs
index 7253d1a7..8f1f0112 100644
--- a/crates/core/tedge/src/cli/connect/cli.rs
+++ b/crates/core/tedge/src/cli/connect/cli.rs
@@ -2,7 +2,7 @@ use crate::cli::connect::*;
 use crate::command::{BuildCommand, BuildContext, Command};
 use crate::system_services::service_manager;
 
-#[derive(clap::Subcommand, Debug, PartialEq)]
+#[derive(clap::Subcommand, Debug, Eq, PartialEq)]
 pub enum TEdgeConnectOpt {
     /// Create connection to Cumulocity
     ///
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 68af7d00..5de4f5cc 100644
--- a/crates/core/tedge/src/cli/connect/common_mosquitto_config.rs
+++ b/crates/core/tedge/src/cli/connect/common_mosquitto_config.rs
@@ -1,6 +1,6 @@
 const COMMON_MOSQUITTO_CONFIG_FILENAME: &str = "tedge-mosquitto.conf";
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ListenerConfig {
     pub port: Option<u16>,
     pub bind_address: Option<String>,
@@ -67,7 +67,7 @@ impl ListenerConfig {
     }
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct CommonMosquittoConfig {
     pub config_file: String,
     pub internal_listener: ListenerConfig,
diff --git a/crates/core/tedge/src/system_services/managers/config.rs b/crates/core/tedge/src/system_services/managers/config.rs
index 252bbaf7..24d4ff92 100644
--- a/crates/core/tedge/src/system_services/managers/config.rs
+++ b/crates/core/tedge/src/system_services/managers/config.rs
@@ -5,12 +5,12 @@ use std::path::PathBuf;
 
 pub const SERVICE_CONFIG_FILE: &str = "system.toml";
 
-#[derive(Deserialize, Debug, Default, PartialEq)]
+#[derive(Deserialize, Debug, Default, Eq, PartialEq)]
 pub struct SystemConfig {
     pub(crate) init: InitConfig,
 }
 
-#[derive(Deserialize, Debug, PartialEq)]
+#[derive(Deserialize, Debug, Eq, PartialEq)]
 #[serde(deny_unknown_fields)]
 pub struct InitConfig {
     pub name: String,
diff --git a/crates/core/tedge_agent/src/state.rs b/crates/core/tedge_agent/src/state.rs
index 7f482822..7757063c 100644
--- a/crates/core/tedge_agent/src/state.rs
+++ b/crates/core/tedge_agent/src/state.rs
@@ -88,7 +88,7 @@ impl AgentStateRepository {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(untagged)]
 pub enum StateStatus {
     Software(SoftwareOperationVariants),
@@ -96,20 +96,20 @@ pub enum StateStatus {
     UnknownOperation,
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(rename_all = "lowercase")]
 pub enum SoftwareOperationVariants {
     List,
     Update,
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub enum RestartOperationStatus {
     Pending,
     Restarting,
 }
 
-#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct State {
     pub operation_id: Option<String>,
diff --git a/crates/core/tedge_mapper/src/c8y/topic.rs b/crates/core/tedge_mapper/src/c8y/t