From 08fa2715df50e1f599ab3d3030ec1b1832579c81 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 4 Feb 2022 12:05:07 +0100 Subject: Derive Default impl This fixes clippy lint `clippy::derivable_impls`. Signed-off-by: Matthias Beyer --- crates/core/tedge/src/system_services/managers/config.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'crates/core') 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 { let config_path = config_root.join(SERVICE_CONFIG_FILE); -- cgit v1.2.3 From b22a2a224b7bc9aa90e2f737652e8dd254435854 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 4 Feb 2022 12:05:53 +0100 Subject: Allow From* prefix in enum variants This patch hides `clippy::enum_variant_names`, because renaming the variants would be too drastic at this point. Signed-off-by: Matthias Beyer --- crates/core/tedge/src/error.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'crates/core') 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), -- cgit v1.2.3 From d77d3c2daf3e1afc4f6a317e15b9faf3547f45dc Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 4 Feb 2022 12:07:01 +0100 Subject: Remove unnecessary .to_string() call This fixes clippy lint `clippy::to_string_in_format_args`. Signed-off-by: Matthias Beyer --- crates/core/tedge/src/cli/connect/common_mosquitto_config.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'crates/core') 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)?; -- cgit v1.2.3 From 507f80a4f7d555a7db0e2203eb93c06699642758 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 4 Feb 2022 12:07:01 +0100 Subject: Remove unnecessary .clone() call This fixes clippy lint `clippy::redundant_clone`. Signed-off-by: Matthias Beyer --- crates/core/tedge/src/cli/connect/command.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/core') diff --git a/crates/core/tedge/src/cli/connect/command.rs b/crates/core/tedge/src/cli/connect/command.rs index 6363efbf..2048d398 100644 --- a/crates/core/tedge/src/cli/connect/command.rs +++ b/crates/core/tedge/src/cli/connect/command.rs @@ -75,7 +75,7 @@ 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(()) } -- cgit v1.2.3 From 701fd47181464114a2d71937d33a2cad0b61d519 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 23 Feb 2022 09:11:08 +0100 Subject: Make match more explicit This patch makes the match arm more explicit, so we do not have the "catch-it-all" feeling here. Signed-off-by: Matthias Beyer --- crates/core/tedge/src/cli/connect/command.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/core') diff --git a/crates/core/tedge/src/cli/connect/command.rs b/crates/core/tedge/src/cli/connect/command.rs index 2048d398..2a38a42e 100644 --- a/crates/core/tedge/src/cli/connect/command.rs +++ b/crates/core/tedge/src/cli/connect/command.rs @@ -79,7 +79,7 @@ impl Command for ConnectCommand { 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() -- cgit v1.2.3 From 6601e96d34e2db5e75d13a662a422a3ae9673a86 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 4 Feb 2022 12:10:01 +0100 Subject: Remove unneeded `return` keyword Signed-off-by: Matthias Beyer --- .../tedge/src/cli/connect/c8y_direct_connection.rs | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'crates/core') 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..a15e62d3 100644 --- a/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs +++ b/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs @@ -140,10 +140,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.len() > 0 => Ok(key[0].clone()), + _ => Err(ConnectError::UnknownPrivateKeyFormat), } } @@ -153,10 +151,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.len() > 0 => Ok(key[0].clone()), + _ => Err(ConnectError::UnknownPrivateKeyFormat), } } @@ -165,14 +161,7 @@ fn read_cert_chain( ) -> Result, ConnectError> { let f = File::open(cert_file)?; let mut cert_reader = BufReader::new(f); - let result = certs(&mut cert_reader); - let cert_chain: Vec = match result { - Ok(cert) => cert, - Err(_) => { - return Err(ConnectError::RumqttcCertificate); - } - }; - Ok(cert_chain) + certs(&mut cert_reader).map_err(|_| ConnectError::RumqttcCertificate) } #[cfg(test)] -- cgit v1.2.3 From f5f3ddaae705e10ba10386b3b4b2fe3490a48d5e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 4 Feb 2022 12:10:53 +0100 Subject: Remove unneeded borrowing Signed-off-by: Matthias Beyer --- crates/core/tedge/src/cli/connect/c8y_direct_connection.rs | 4 ++-- crates/core/tedge/src/cli/connect/command.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/core') 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 a15e62d3..ae7b5c22 100644 --- a/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs +++ b/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs @@ -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 { diff --git a/crates/core/tedge/src/cli/connect/command.rs b/crates/core/tedge/src/cli/connect/command.rs index 2a38a42e..98641191 100644 --- a/crates/core/tedge/src/cli/connect/command.rs +++ b/crates/core/tedge/src/cli/connect/command.rs @@ -407,7 +407,7 @@ fn new_bridge( let () = c8y_direct_connection::create_device_with_direct_connection( user_manager, bridge_config, - &device_type, + device_type, )?; } -- cgit v1.2.3 From 481eaa0b85eb232e6f8520ddd35799714ff8e22a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 4 Feb 2022 12:11:32 +0100 Subject: Replace unidomatic .len() > 0 with .is_empty() Signed-off-by: Matthias Beyer --- crates/core/tedge/src/cli/connect/c8y_direct_connection.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/core') 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 ae7b5c22..c69b44f3 100644 --- a/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs +++ b/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs @@ -140,7 +140,7 @@ 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 => Ok(key[0].clone()), + Ok(key) if !key.is_empty() => Ok(key[0].clone()), _ => Err(ConnectError::UnknownPrivateKeyFormat), } } @@ -151,7 +151,7 @@ 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 => Ok(key[0].clone()), + Ok(key) if !key.is_empty() => Ok(key[0].clone()), _ => Err(ConnectError::UnknownPrivateKeyFormat), } } -- cgit v1.2.3 From 2ad9068492aca4d20247da79a855000a92a6c787 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 4 Feb 2022 12:12:12 +0100 Subject: Replace macro invocation with .to_string() call Signed-off-by: Matthias Beyer --- crates/core/tedge/src/cli/connect/c8y_direct_connection.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'crates/core') 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 c69b44f3..507c6c1a 100644 --- a/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs +++ b/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs @@ -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(()) } -- cgit v1.2.3 From 103c5ff0c3d585d9b7177d88e9e66137fe875124 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 4 Feb 2022 12:12:59 +0100 Subject: Replace single-character string constant with character This fixes clippy lint `clippy::single_char_pattern`. Signed-off-by: Matthias Beyer --- crates/core/tedge/src/cli/connect/c8y_direct_connection.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/core') 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 507c6c1a..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)); -- cgit v1.2.3