From 94a361d7da8db72c76f0b7c3d1546be5d17c292a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 14:52:22 +0200 Subject: Fix clippy: Remove unnecessary binding This fixes clippy::let_and_return. Signed-off-by: Matthias Beyer --- plugins/tedge_apt_plugin/src/main.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/tedge_apt_plugin/src/main.rs b/plugins/tedge_apt_plugin/src/main.rs index ed221d39..f848b609 100644 --- a/plugins/tedge_apt_plugin/src/main.rs +++ b/plugins/tedge_apt_plugin/src/main.rs @@ -73,7 +73,7 @@ fn run(operation: PluginOp) -> Result { // apt output = openssl/focal-security,now 1.1.1f-1ubuntu2.3 amd64 [installed] // awk -F '[/ ]' = $1 ^ $2 ^ $3 ^ $4 // awk print = name ^ ^ version ^ - let status = Command::new("awk") + Command::new("awk") .args(vec![ "-F", "[/ ]", @@ -81,9 +81,7 @@ fn run(operation: PluginOp) -> Result { ]) .stdin(apt.stdout.unwrap()) // Cannot panic: apt.stdout has been set .status() - .map_err(|err| InternalError::exec_error("awk", err))?; - - status + .map_err(|err| InternalError::exec_error("awk", err))? } PluginOp::Install { -- cgit v1.2.3 From 3ab8c14af3c5e46f885b2a89b8d8d45a15311b9e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 14:55:06 +0200 Subject: Fix clippy: Remove needless return keyword This fixes clippy::needless_return Signed-off-by: Matthias Beyer --- crates/common/flockfile/src/unix.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/crates/common/flockfile/src/unix.rs b/crates/common/flockfile/src/unix.rs index 4ef847d2..79fb71e4 100644 --- a/crates/common/flockfile/src/unix.rs +++ b/crates/common/flockfile/src/unix.rs @@ -116,15 +116,13 @@ pub fn check_another_instance_is_not_running( .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) - } + 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(err) } - } + }, } } -- cgit v1.2.3 From 17d1ce7a45b21d7dadfbf9d7a80e05f1b26d459d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 14:57:10 +0200 Subject: Refactor for readability This patch refactors `check_another_instance_is_not_running()` for readability. Signed-off-by: Matthias Beyer --- crates/common/flockfile/src/unix.rs | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/crates/common/flockfile/src/unix.rs b/crates/common/flockfile/src/unix.rs index 79fb71e4..dc9a8d39 100644 --- a/crates/common/flockfile/src/unix.rs +++ b/crates/common/flockfile/src/unix.rs @@ -110,20 +110,15 @@ pub fn check_another_instance_is_not_running( app_name: &str, run_dir: &Path, ) -> Result { - match Flockfile::new_lock( - run_dir - .join(format!("{}{}.lock", LOCK_CHILD_DIRECTORY, app_name)) - .as_path(), - ) { - Ok(file) => Ok(file), - 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(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)] -- cgit v1.2.3 From 8c5f43f82416bda3e5da64c3e8aefba0b0e67640 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:07:39 +0200 Subject: Fix clippy: download: Add derive for Eq This fixes clippy::derive_partial_eq_without_eq Signed-off-by: Matthias Beyer --- crates/common/download/src/download.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/common/download/src/download.rs b/crates/common/download/src/download.rs index cc96f689..9b2f32fa 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 { -- cgit v1.2.3 From db027cb7d063e1a88cffd4fc6607d7b28ae9a781 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:07:39 +0200 Subject: Fix clippy: agent_interface: Add derive for Eq This fixes clippy::derive_partial_eq_without_eq Signed-off-by: Matthias Beyer --- crates/core/agent_interface/src/error.rs | 2 +- crates/core/agent_interface/src/messages.rs | 24 ++++++++++++------------ crates/core/agent_interface/src/software.rs | 4 ++-- crates/core/agent_interface/src/topic.rs | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) 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 for Option { } } -#[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, @@ -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, -- cgit v1.2.3 From 65ced46ffbe325ca85d45a98b0e60dc560f7476a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:07:39 +0200 Subject: Fix clippy: c8y_api: Add derive for Eq This fixes clippy::derive_partial_eq_without_eq Signed-off-by: Matthias Beyer --- crates/core/c8y_api/src/json_c8y.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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, } -#[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, @@ -87,7 +87,7 @@ impl From for C8ySoftwareModuleItem { } } -#[derive(Debug, Serialize, Deserialize, PartialEq)] +#[derive(Debug, Serialize, Deserialize, Eq, PartialEq)] #[serde(rename_all = "camelCase")] pub struct C8yUpdateSoftwareListResponse { #[serde(rename = "c8y_SoftwareList")] -- cgit v1.2.3 From 6cd599b95bb62c2539b2f7c9940c47a54e53d155 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:07:40 +0200 Subject: Fix clippy: c8y_smartrest: Add derive for Eq This fixes clippy::derive_partial_eq_without_eq Signed-off-by: Matthias Beyer --- crates/core/c8y_smartrest/src/operations.rs | 4 ++-- crates/core/c8y_smartrest/src/smartrest_deserializer.rs | 14 +++++++------- crates/core/c8y_smartrest/src/smartrest_serializer.rs | 14 +++++++------- crates/core/c8y_smartrest/src/topic.rs | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) 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, @@ -20,7 +20,7 @@ pub struct OnMessageExec { user: Option, } -#[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 54e96855..35e42b53 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 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, } -#[derive(Debug, Deserialize, Serialize, PartialEq)] +#[derive(Debug, Deserialize, Serialize, Eq, PartialEq)] pub struct SmartRestUpdateSoftwareModule { pub software: String, pub version: Option, @@ -211,7 +211,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 +226,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 +234,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 +243,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 +255,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, @@ -54,7 +54,7 @@ impl From> 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, pub url: Option, } -#[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 for C8yTopic { } } -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, Eq, PartialEq)] pub enum MapperSubscribeTopic { C8yTopic(C8yTopic), ResponseTopic(ResponseTopic), -- cgit v1.2.3 From 27d21b7e0f4a0563e279189ed9152d9a89929fe2 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:07:40 +0200 Subject: Fix clippy: c8y_translator: Add derive for Eq This fixes clippy::derive_partial_eq_without_eq Signed-off-by: Matthias Beyer --- crates/core/c8y_translator/src/serializer.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, -- cgit v1.2.3 From 82b56a1be761836ae2836df3a5d978d446d48ca6 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:07:40 +0200 Subject: Fix clippy: tedge: Add derive for Eq This fixes clippy::derive_partial_eq_without_eq Signed-off-by: Matthias Beyer --- crates/core/tedge/src/cli/connect/bridge_config.rs | 2 +- crates/core/tedge/src/cli/connect/bridge_config_azure.rs | 2 +- crates/core/tedge/src/cli/connect/bridge_config_c8y.rs | 2 +- crates/core/tedge/src/cli/connect/cli.rs | 2 +- crates/core/tedge/src/cli/connect/common_mosquitto_config.rs | 4 ++-- crates/core/tedge/src/system_services/managers/config.rs | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) 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, pub bind_address: Option, @@ -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, -- cgit v1.2.3 From 217cf351d342c842a58fbc50fce76d62a4947168 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:07:40 +0200 Subject: Fix clippy: tedge_agent: Add derive for Eq This fixes clippy::derive_partial_eq_without_eq Signed-off-by: Matthias Beyer --- crates/core/tedge_agent/src/state.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/core/tedge_agent/src/state.rs b/crates/core/tedge_agent/src/state.rs index 36b378dd..3fdb8831 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, -- cgit v1.2.3 From 9faefbe919cc09d5763978daac9d15c492eebb55 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:07:41 +0200 Subject: Fix clippy: tedge_mapper: Add derive for Eq This fixes clippy::derive_partial_eq_without_eq Signed-off-by: Matthias Beyer --- crates/core/tedge_mapper/src/c8y/topic.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/core/tedge_mapper/src/c8y/topic.rs b/crates/core/tedge_mapper/src/c8y/topic.rs index 7df4f5af..d8faebb7 100644 --- a/crates/core/tedge_mapper/src/c8y/topic.rs +++ b/crates/core/tedge_mapper/src/c8y/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 for C8yTopic { } } -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, Eq, PartialEq)] pub enum MapperSubscribeTopic { C8yTopic(C8yTopic), ResponseTopic(ResponseTopic), -- cgit v1.2.3 From e9a7fc83edfda48c844455da068d170a9a9af947 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:07:41 +0200 Subject: Fix clippy: thin_edge_json: Add derive for Eq This fixes clippy::derive_partial_eq_without_eq Signed-off-by: Matthias Beyer --- crates/core/thin_edge_json/src/alarm.rs | 6 +++--- crates/core/thin_edge_json/src/event.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/core/thin_edge_json/src/alarm.rs b/crates/core/thin_edge_json/src/alarm.rs index 783fc355..948f892b 100644 --- a/crates/core/thin_edge_json/src/alarm.rs +++ b/crates/core/thin_edge_json/src/alarm.rs @@ -4,14 +4,14 @@ use clock::Timestamp; use serde::Deserialize; /// In-memory representation of ThinEdge JSON alarm. -#[derive(Debug, Deserialize, PartialEq)] +#[derive(Debug, Deserialize, Eq, PartialEq)] pub struct ThinEdgeAlarm { pub name: String, pub severity: AlarmSeverity, pub data: Option, } -#[derive(Debug, Deserialize, PartialEq)] +#[derive(Debug, Deserialize, Eq, PartialEq)] pub enum AlarmSeverity { Critical, Major, @@ -20,7 +20,7 @@ pub enum AlarmSeverity { } /// In-memory representation of ThinEdge JSON alarm payload -#[derive(Debug, Deserialize, PartialEq)] +#[derive(Debug, Deserialize, Eq, PartialEq)] pub struct ThinEdgeAlarmData { pub text: Option, diff --git a/crates/core/thin_edge_json/src/event.rs b/crates/core/thin_edge_json/src/event.rs index 20052f0e..8d3950f5 100644 --- a/crates/core/thin_edge_json/src/event.rs +++ b/crates/core/thin_edge_json/src/event.rs @@ -7,7 +7,7 @@ use serde_json::Value; use self::error::ThinEdgeJsonDeserializerError; /// In-memory representation of ThinEdge JSON event. -#[derive(Debug, Serialize, Deserialize, PartialEq)] +#[derive(Debug, Serialize, Deserialize, Eq, PartialEq)] pub struct ThinEdgeEvent { #[serde(rename = "type")] pub name: String, @@ -17,7 +17,7 @@ pub struct ThinEdgeEvent { } /// In-memory representation of ThinEdge JSON event payload -#[derive(Debug, Serialize, Deserialize, PartialEq)] +#[derive(Debug, Serialize, Deserialize, Eq, PartialEq)] pub struct ThinEdgeEventData { pub text: Option, -- cgit v1.2.3 From 9677f3a0ac68ca4e55da871f39729199a2e6eae7 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:07:41 +0200 Subject: Fix clippy: c8y_configuration_plugin: Add derive for Eq This fixes clippy::derive_partial_eq_without_eq Signed-off-by: Matthias Beyer --- plugins/c8y_configuration_plugin/src/config.rs | 2 +- plugins/c8y_configuration_plugin/src/download.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/c8y_configuration_plugin/src/config.rs b/plugins/c8y_configuration_plugin/src/config.rs index d738bda2..31385253 100644 --- a/plugins/c8y_configuration_plugin/src/config.rs +++ b/plugins/c8y_configuration_plugin/src/config.rs @@ -16,7 +16,7 @@ struct RawPluginConfig { pub files: Vec, } -#[derive(Deserialize, Debug, Default, PartialEq)] +#[derive(Deserialize, Debug, Default, Eq, PartialEq)] #[serde(deny_unknown_fields)] pub struct RawFileEntry { pub path: String, diff --git a/plugins/c8y_configuration_plugin/src/download.rs b/plugins/c8y_configuration_plugin/src/download.rs index 807d0cdb..ba7d3542 100644 --- a/plugins/c8y_configuration_plugin/src/download.rs +++ b/plugins/c8y_configuration_plugin/src/download.rs @@ -102,7 +102,7 @@ async fn download_config_file( Ok(()) } -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, Eq, PartialEq)] pub struct ConfigDownloadRequest { pub download_info: DownloadInfo, pub file_path: PathBuf, -- cgit v1.2.3 From c75b2e84b2af06f6c7e271cbebb09c10034d3044 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:14:10 +0200 Subject: Fix clippy: Remove unnecessary .to_string() This fixes clippy::unnecessary_to_owned Signed-off-by: Matthias Beyer --- crates/core/c8y_smartrest/src/smartrest_deserializer.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/crates/core/c8y_smartrest/src/smartrest_deserializer.rs b/crates/core/c8y_smartrest/src/smartrest_deserializer.rs index 35e42b53..654e1441 100644 --- a/crates/core/c8y_smartrest/src/smartrest_deserializer.rs +++ b/crates/core/c8y_smartrest/src/smartrest_deserializer.rs @@ -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, }; -- cgit v1.2.3 From f2a14038f7f395f8439b62cc70ad259ffa09a205 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:19:59 +0200 Subject: Fix clippy: tests: Do not use format!() to append to String This fixes clippy::format_push_string. The error returned from write!() is ignored in this case. Signed-off-by: Matthias Beyer --- crates/tests/sawtooth_publisher/src/main.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/tests/sawtooth_publisher/src/main.rs b/crates/tests/sawtooth_publisher/src/main.rs index ff89aaa1..527eefd3 100644 --- a/crates/tests/sawtooth_publisher/src/main.rs +++ b/crates/tests/sawtooth_publisher/src/main.rs @@ -9,6 +9,7 @@ use mqtt_channel::{ }; use std::convert::TryFrom; use std::env; +use std::fmt::Write as _; use std::io::Write; use std::process; use std::time::{Duration, Instant}; @@ -163,7 +164,8 @@ async fn publish_multi_topic( for value in 0..height { let mut series: String = String::new(); for s in 0..series_count { - series += &format!( + let _ = write!( + series, "\"saw_{}\": {} ,", s, (value + s * height / series_count) % height -- cgit v1.2.3 From 3b92e874d0a8b8bf6fbbb5203895632d08706f7e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 18 Aug 2022 15:19:59 +0200 Subject: Fix clippy: logged_command: Do not use format!() to append to String This fixes clippy::format_push_string. The error returned from write!() is ignored in this case. Signed-off-by: Matthias Beyer --- crates/common/logged_command/src/logged_command.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) -> &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 } -- cgit v1.2.3