diff options
Diffstat (limited to 'crates/core')
22 files changed, 63 insertions, 72 deletions
diff --git a/crates/core/c8y_api/src/http_proxy.rs b/crates/core/c8y_api/src/http_proxy.rs index 3d1288d6..83d9b6bf 100644 --- a/crates/core/c8y_api/src/http_proxy.rs +++ b/crates/core/c8y_api/src/http_proxy.rs @@ -157,8 +157,7 @@ impl C8yMqttJwtTokenRetriever { #[async_trait] impl C8yJwtTokenRetriever for C8yMqttJwtTokenRetriever { async fn get_jwt_token(&mut self) -> Result<SmartRestJwtResponse, SMCumulocityMapperError> { - let () = self - .mqtt_con + self.mqtt_con .published .publish(mqtt_channel::Message::new( &Topic::new_unchecked("c8y/s/uat"), @@ -237,7 +236,7 @@ impl JwtAuthHttpProxy { let mut mqtt_con = Connection::new(&mqtt_config).await?; // Ignore errors on this connection - let () = mqtt_con.errors.close(); + mqtt_con.errors.close(); let jwt_token_retriver = Box::new(C8yMqttJwtTokenRetriever::new(mqtt_con)); diff --git a/crates/core/c8y_smartrest/src/smartrest_deserializer.rs b/crates/core/c8y_smartrest/src/smartrest_deserializer.rs index 54e96855..63b031fc 100644 --- a/crates/core/c8y_smartrest/src/smartrest_deserializer.rs +++ b/crates/core/c8y_smartrest/src/smartrest_deserializer.rs @@ -57,7 +57,7 @@ impl Default for SmartRestUpdateSoftware { impl SmartRestUpdateSoftware { pub fn from_smartrest(&self, smartrest: &str) -> Result<Self, SmartRestDeserializerError> { let mut message_id = smartrest.to_string(); - let () = message_id.truncate(3); + message_id.truncate(3); let mut rdr = ReaderBuilder::new() .has_headers(false) @@ -461,7 +461,7 @@ mod tests { url: Some("url1".into()), file_path: None, })); - let () = expected_thin_edge_json.add_update(SoftwareModuleUpdate::remove(SoftwareModule { + expected_thin_edge_json.add_update(SoftwareModuleUpdate::remove(SoftwareModule { module_type: Some("".to_string()), name: "software2".to_string(), version: None, diff --git a/crates/core/c8y_translator/src/json.rs b/crates/core/c8y_translator/src/json.rs index 0ecacd4f..41d8ae35 100644 --- a/crates/core/c8y_translator/src/json.rs +++ b/crates/core/c8y_translator/src/json.rs @@ -50,7 +50,7 @@ fn from_thin_edge_json_with_timestamp( maybe_child_id: Option<&str>, ) -> Result<String, CumulocityJsonError> { let mut serializer = serializer::C8yJsonSerializer::new(timestamp, maybe_child_id); - let () = parse_str(input, &mut serializer)?; + parse_str(input, &mut serializer)?; Ok(serializer.into_string()?) } diff --git a/crates/core/plugin_sm/src/operation_logs.rs b/crates/core/plugin_sm/src/operation_logs.rs index 7bf08eab..7912eaa7 100644 --- a/crates/core/plugin_sm/src/operation_logs.rs +++ b/crates/core/plugin_sm/src/operation_logs.rs @@ -108,10 +108,10 @@ impl OperationLogs { for (key, value) in log_tracker.iter_mut() { if key.starts_with("software-list") { // only allow one update list file in logs - let () = remove_old_logs(value, &self.log_dir, 1)?; + remove_old_logs(value, &self.log_dir, 1)?; } else { // allow most recent five - let () = remove_old_logs(value, &self.log_dir, 5)?; + remove_old_logs(value, &self.log_dir, 5)?; } } diff --git a/crates/core/plugin_sm/tests/plugin.rs b/crates/core/plugin_sm/tests/plugin.rs index 724813fb..366bfbcf 100644 --- a/crates/core/plugin_sm/tests/plugin.rs +++ b/crates/core/plugin_sm/tests/plugin.rs @@ -410,7 +410,7 @@ mod tests { fn get_dummy_plugin_tmp_path() -> PathBuf { let path = PathBuf::from_str("/tmp/.tedge_dummy_plugin").unwrap(); if !&path.exists() { - let () = fs::create_dir(&path).unwrap(); + fs::create_dir(&path).unwrap(); } path } diff --git a/crates/core/tedge/src/cli/certificate/create.rs b/crates/core/tedge/src/cli/certificate/create.rs index 2d1589c9..83eeb45f 100644 --- a/crates/core/tedge/src/cli/certificate/create.rs +++ b/crates/core/tedge/src/cli/certificate/create.rs @@ -28,7 +28,7 @@ impl Command for CreateCertCmd { fn execute(&self) -> anyhow::Result<()> { let config = NewCertificateConfig::default(); - let () = self.create_test_certificate(&config)?; + self.create_test_certificate(&config)?; Ok(()) } } diff --git a/crates/core/tedge/src/cli/certificate/remove.rs b/crates/core/tedge/src/cli/certificate/remove.rs index 8f978972..c1007b44 100644 --- a/crates/core/tedge/src/cli/certificate/remove.rs +++ b/crates/core/tedge/src/cli/certificate/remove.rs @@ -18,7 +18,7 @@ impl Command for RemoveCertCmd { } fn execute(&self) -> anyhow::Result<()> { - let () = self.remove_certificate()?; + self.remove_certificate()?; Ok(()) } } diff --git a/crates/core/tedge/src/cli/certificate/show.rs b/crates/core/tedge/src/cli/certificate/show.rs index 8890f308..24bc493d 100644 --- a/crates/core/tedge/src/cli/certificate/show.rs +++ b/crates/core/tedge/src/cli/certificate/show.rs @@ -16,7 +16,7 @@ impl Command for ShowCertCmd { } fn execute(&self) -> anyhow::Result<()> { - let () = self.show_certificate()?; + self.show_certificate()?; Ok(()) } } diff --git a/crates/core/tedge/src/cli/config/commands/set.rs b/crates/core/tedge/src/cli/config/commands/set.rs index 715f2664..ce2493a6 100644 --- a/crates/core/tedge/src/cli/config/commands/set.rs +++ b/crates/core/tedge/src/cli/config/commands/set.rs @@ -18,7 +18,7 @@ impl Command for SetConfigCommand { fn execute(&self) -> anyhow::Result<()> { let mut config = self.config_repository.load()?; - let () = (self.config_key.set)(&mut config, self.value.to_string())?; + (self.config_key.set)(&mut config, self.value.to_string())?; self.config_repository.store(&config)?; Ok(()) } diff --git a/crates/core/tedge/src/cli/config/commands/unset.rs b/crates/core/tedge/src/cli/config/commands/unset.rs index 222d8a3e..a975a58d 100644 --- a/crates/core/tedge/src/cli/config/commands/unset.rs +++ b/crates/core/tedge/src/cli/config/commands/unset.rs @@ -17,7 +17,7 @@ impl Command for UnsetConfigCommand { fn execute(&self) -> anyhow::Result<()> { let mut config = self.config_repository.load()?; - let () = (self.config_key.unset)(&mut config)?; + (self.config_key.unset)(&mut config)?; self.config_repository.store(&config)?; Ok(()) } 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 89400667..1683b4d8 100644 --- a/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs +++ b/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs @@ -29,7 +29,7 @@ pub fn create_device_with_direct_connection( let mut client_config = ClientConfig::new(); - let () = load_root_certs( + load_root_certs( &mut client_config.root_store, bridge_config.bridge_root_cert_path.clone(), )?; diff --git a/crates/core/tedge/src/cli/connect/command.rs b/crates/core/tedge/src/cli/connect/command.rs index 8714bdd7..c525eb1d 100644 --- a/crates/core/tedge/src/cli/connect/command.rs +++ b/crates/core/tedge/src/cli/connect/command.rs @@ -242,7 +242,7 @@ where TEdgeConfig: ConfigSettingAccessor<T>, { let value = config.query(setting)?; - let () = config.update(setting, value)?; + config.update(setting, value)?; Ok(()) } @@ -402,17 +402,14 @@ fn new_bridge( } println!("Checking if configuration for requested bridge already exists.\n"); - let () = bridge_config_exists(config_location, bridge_config)?; + bridge_config_exists(config_location, bridge_config)?; println!("Validating the bridge certificates.\n"); - let () = bridge_config.validate()?; + bridge_config.validate()?; if bridge_config.cloud_name.eq("c8y") { println!("Creating the device in Cumulocity cloud.\n"); - let () = c8y_direct_connection::create_device_with_direct_connection( - bridge_config, - device_type, - )?; + c8y_direct_connection::create_device_with_direct_connection(bridge_config, device_type)?; } println!("Saving configuration for requested bridge.\n"); @@ -522,12 +519,12 @@ fn write_bridge_config_to_file( get_common_mosquitto_config_file_path(config_location, common_mosquitto_config); let mut common_draft = DraftFile::new(&common_config_path)?; common_mosquitto_config.serialize(&mut common_draft)?; - let () = common_draft.persist()?; + common_draft.persist()?; let config_path = get_bridge_config_file_path(config_location, bridge_config); let mut config_draft = DraftFile::new(config_path)?; bridge_config.serialize(&mut config_draft)?; - let () = config_draft.persist()?; + config_draft.persist()?; Ok(()) } diff --git a/crates/core/tedge/src/system_services/manager.rs b/crates/core/tedge/src/system_services/manager.rs index 83b4cd56..08caf6d9 100644 --- a/crates/core/tedge/src/system_services/manager.rs +++ b/crates/core/tedge/src/system_services/manager.rs @@ -33,7 +33,7 @@ pub trait SystemServiceManager: Debug { service: SystemService, ) -> Result<bool, SystemServiceError> { if self.is_service_running(service)? { - let () = self.restart_service(service)?; + self.restart_service(service)?; Ok(true) } else { Ok(false) diff --git a/crates/core/tedge_agent/src/agent.rs b/crates/core/tedge_agent/src/agent.rs index 69acdd40..bf8f2821 100644 --- a/crates/core/tedge_agent/src/agent.rs +++ b/crates/core/tedge_agent/src/agent.rs @@ -280,7 +280,7 @@ impl SmAgent { } }); - let () = self.process_pending_operation(&mut mqtt.published).await?; + self.process_pending_operation(&mut mqtt.published).await?; while let Err(error) = self .process_subscribed_messages(&mut mqtt.received, &mut mqtt.published, &plugins) @@ -320,8 +320,8 @@ impl SmAgent { } topic if topic == &self.config.request_topic_update => { - let () = plugins.lock().await.load()?; - let () = plugins + plugins.lock().await.load()?; + plugins .lock() .await .update_default(&get_default_plugin(&self.config.config_location)?)?; @@ -352,7 +352,7 @@ impl SmAgent { self.persistance_store.clear().await?; let status = OperationStatus::Failed; let response = RestartOperationResponse::new(&request).with_status(status); - let () = responses + responses .publish(Message::new( &self.config.response_topic_restart, response.to_bytes()?, @@ -377,8 +377,7 @@ impl SmAgent { ) -> Result<(), AgentError> { let request = match SoftwareListRequest::from_slice(message.payload_bytes()) { Ok(request) => { - let () = self - .persistance_store + self.persistance_store .store(&State { operation_id: Some(request.id.clone()), operation: Some(StateStatus::Software(SoftwareOperationVariants::List)), @@ -390,7 +389,7 @@ impl SmAgent { Err(error) => { debug!("Parsing error: {}", error); - let () = responses + responses .publish(Message::new( &self.config.errors_topic, format!("{}", error), @@ -405,7 +404,7 @@ impl SmAgent { }; let mut executing_response = SoftwareListResponse::new(&request); - let () = responses + responses .publish(Message::new( &self.config.response_topic_list, executing_response.to_bytes()?, @@ -425,7 +424,7 @@ impl SmAgent { } }; - let () = responses + responses .publish(Message::new(response_topic, response.to_bytes()?)) .await?; @@ -456,7 +455,7 @@ impl SmAgent { Err(error) => { error!("Parsing error: {}", error); - let () = responses + responses .publish(Message::new( &self.config.errors_topic, format!("{}", error), @@ -471,7 +470,7 @@ impl SmAgent { }; let mut executing_response = SoftwareUpdateResponse::new(&request); - let () = responses + responses .publish(Message::new(response_topic, executing_response.to_bytes()?)) .await?; @@ -494,7 +493,7 @@ impl SmAgent { } }; - let () = responses + responses .publish(Message::new(response_topic, response.to_bytes()?)) .await?; @@ -510,8 +509,7 @@ impl SmAgent { ) -> Result<RestartOperationRequest, AgentError> { let request = match RestartOperationRequest::from_slice(message.payload_bytes()) { Ok(request) => { - let () = self - .persistance_store + self.persistance_store .store(&State { operation_id: Some(request.id.clone()), operation: Some(StateStatus::Restart(RestartOperationStatus::Restarting)), @@ -522,7 +520,7 @@ impl SmAgent { Err(error) => { error!("Parsing error: {}", error); - let () = responses + responses .publish(Message::new( &self.config.errors_topic, format!("{}", error), @@ -549,10 +547,10 @@ impl SmAgent { // update status to executing. let executing_response = RestartOperationResponse::new(&RestartOperationRequest::default()); - let () = responses + responses .publish(Message::new(topic, executing_response.to_bytes()?)) .await?; - let () = restart_operation::create_slash_run_file(&self.config.run_dir)?; + restart_operation::create_slash_run_file(&self.config.run_dir)?; let command_vec = get_restart_operation_commands(); for mut command in command_vec { @@ -618,7 +616,7 @@ impl SmAgent { let response = SoftwareRequestResponse::new(&id, status); - let () = responses + responses .publish(Message::new(topic, response.to_bytes()?)) .await?; } @@ -689,7 +687,7 @@ mod tests { let (_output, mut output_stream) = mqtt_tests::output_stream(); let response_topic_restart = Topic::new(RestartOperationResponse::topic_name()).expect("Invalid topic"); - let () = agent + agent .handle_restart_operation(&mut output_stream, &response_topic_restart) .await?; assert!(std::path::Path::new( @@ -765,7 +763,7 @@ mod tests { ) .unwrap(), )); - let () = agent + agent .handle_software_list_request( &mut output_sink, plugins, @@ -809,7 +807,7 @@ mod tests { ) .unwrap(), )); - let () = agent + agent .process_subscribed_messages(&mut requests, &mut response_sink, &plugins) .await .unwrap(); diff --git a/crates/core/tedge_agent/src/restart_operation_handler.rs b/crates/core/tedge_agent/src/restart_operation_handler.rs index 29342cb0..e6db967f 100644 --- a/crates/core/tedge_agent/src/restart_operation_handler.rs +++ b/crates/core/tedge_agent/src/restart_operation_handler.rs @@ -12,7 +12,7 @@ pub mod restart_operation { /// /// # Example /// ``` - /// let () = RestartOperationHelper::create_slash_run_file()?; + /// RestartOperationHelper::create_slash_run_file()?; /// ``` pub fn create_slash_run_file(run_dir: &Path) -> Result<(), AgentError> { let path = &run_dir.join(SLASH_RUN_PATH_TEDGE_AGENT_RESTART); diff --git a/crates/core/tedge_agent/src/state.rs b/crates/core/tedge_agent/src/state.rs index 36b378dd..7f482822 100644 --- a/crates/core/tedge_agent/src/state.rs +++ b/crates/core/tedge_agent/src/state.rs @@ -41,7 +41,7 @@ impl StateRepository for AgentStateRepository { // Create in path given through `config-dir` or `/etc/tedge` directory in case it does not exist yet if !self.state_repo_root.exists() { - let () = fs::create_dir(&self.state_repo_root).await?; + fs::create_dir(&self.state_repo_root).await?; } let mut temppath = self.state_repo_path.clone(); @@ -58,7 +58,7 @@ impl StateRepository for AgentStateRepository { operation_id: None, operation: None, }; - let () = self.store(&state).await?; + self.store(&state).await?; Ok(state) } diff --git a/crates/core/tedge_mapper/src/az/converter.rs b/crates/core/tedge_mapper/src/az/converter.rs index f7f4b7a9..b9da5b31 100644 --- a/crates/core/tedge_mapper/src/az/converter.rs +++ b/crates/core/tedge_mapper/src/az/converter.rs @@ -41,10 +41,10 @@ impl Converter for AzureConverter { } async fn try_convert(&mut self, input: &Message) -> Result<Vec<Message>, Self::Error> { - let () = self.size_threshold.validate(input)?; + self.size_threshold.validate(input)?; let default_timestamp = self.add_timestamp.then(|| self.clock.now()); let mut serializer = ThinEdgeJsonSerializer::new_with_timestamp(default_timestamp); - let () = thin_edge_json::parser::parse_str(input.payload_str()?, &mut serializer)?; + thin_edge_json::parser::parse_str(input.payload_str()?, &mut serializer)?; let payload = serializer.into_string()?; Ok(vec![(Message::new(&self.mapper_config.out_topic, payload))]) diff --git a/crates/core/tedge_mapper/src/c8y/converter.rs b/crates/core/tedge_mapper/src/c8y/converter.rs index 03123697..8a3b7197 100644 --- a/crates/core/tedge_mapper/src/c8y/converter.rs +++ b/crates/core/tedge_mapper/src/c8y/converter.rs @@ -99,7 +99,7 @@ where .try_into() .expect("topics that mapper should subscribe to"); - let () = topic_filter.add_all(CumulocityMapper::subscriptions(&operations).unwrap()); + topic_filter.add_all(CumulocityMapper::subscriptions(&operations).unwrap()); let mapper_config = MapperConfig { in_topic_filter: topic_filter, @@ -153,7 +153,7 @@ where .try_into() .expect("topics that mapper should subscribe to"); - let () = topic_filter.add_all(CumulocityMapper::subscriptions(&operations).unwrap()); + topic_filter.add_all(CumulocityMapper::subscriptions(&operations).unwrap()); let mapper_config = MapperConfig { in_topic_filter: topic_filter, @@ -348,7 +348,7 @@ where async fn try_convert(&mut self, message: &Message) -> Result<Vec<Message>, ConversionError> { match &message.topic { topic if topic.name.starts_with("tedge/measurements") => { - let () = self.size_threshold.validate(message)?; + self.size_threshold.validate(message)?; self.try_convert_measurement(message) } topic @@ -933,10 +933,10 @@ mod tests { let operation_logs = OperationLogs::try_new(log_dir.path().to_path_buf()).unwrap(); let now = std::time::Instant::now(); - let () = super::execute_operation("5", "sleep", "sleep_one", &operation_logs) + super::execute_operation("5", "sleep", "sleep_one", &operation_logs) .await .unwrap(); - let () = super::execute_operation("5", "sleep", "sleep_two", &operation_logs) + super::execute_operation("5", "sleep", "sleep_two", &operation_logs) .await .unwrap(); diff --git a/crates/core/tedge_mapper/src/c8y/mapper.rs b/crates/core/tedge_mapper/src/c8y/mapper.rs index 502bbc10..f341caa2 100644 --- a/crates/core/tedge_mapper/src/c8y/mapper.rs +++ b/crates/core/tedge_mapper/src/c8y/mapper.rs @@ -225,7 +225,7 @@ mod tests { }); // publish `payload` to `pub_topic` - let () = broker.publish(pub_topic, payload).await?; + broker.publish(pub_topic, payload).await?; // check the `messages` returned contain `expected_msg` assert_received_all_expected(&mut messages, TEST_TIMEOUT_SECS, &[expected_msg]).await; diff --git a/crates/core/thin_edge_json/src/measurement.rs b/crates/core/thin_edge_json/src/measurement.rs index 13be5190..51058db0 100644 --- a/crates/core/thin_edge_json/src/measurement.rs +++ b/crates/core/thin_edge_json/src/measurement.rs @@ -88,9 +88,9 @@ pub trait MeasurementVisitor { name: &str, value: f64, ) -> Result<(), Self::Error> { - let () = self.visit_start_group(group)?; - let () = self.visit_measurement(name, value)?; - let () = self.visit_end_group()?; + self.visit_start_group(group)?; + self.visit_measurement(name, value)?; + self.visit_end_group()?; Ok(()) } } diff --git a/crates/core/thin_edge_json/src/parser.rs b/crates/core/thin_edge_json/src/parser.rs index 297be75e..88db5e73 100644 --- a/crates/core/thin_edge_json/src/parser.rs +++ b/crates/core/thin_edge_json/src/parser.rs @@ -21,7 +21,7 @@ pub fn parse_str<T: MeasurementVisitor>( let parser = ThinEdgeJsonParser { visitor }; - let () = deserializer + deserializer .deserialize_map(parser) .map_err(|error| map_error(error, input))?; Ok(()) @@ -105,8 +105,7 @@ where ) .map_err(|err| de::Error::custom(invalid_timestamp(timestamp_str, err)))?; - let () = self - .visitor + self.visitor .visit_timestamp(timestamp) .map_err(de::Error::custom)?; } @@ -117,7 +116,7 @@ where visitor: self.visitor, }; - let () = map.next_value_seed(parser)?; + map.next_value_seed(parser)?; measurements_count += 1; } } @@ -156,8 +155,7 @@ where return Err(de::Error::custom("Expect single-value measurement")); } - let () = self - .visitor + self.visitor .visit_start_group(self.key.as_ref()) .map_err(de::Error::custom)?; @@ -170,7 +168,7 @@ where visitor: self.visitor, }; - let () = map.next_value_seed(parser)?; + map.next_value_seed(parser)?; measurements_count += 1; } @@ -178,7 +176,7 @@ where return Err(de::Error::custom(invalid_empty_measurement(&self.key))); } - let () = self.visitor.visit_end_group().map_err(de::Error::custom)?; + self.visitor.visit_end_group().map_err(de::Error::custom)?; Ok(()) } @@ -204,8 +202,7 @@ where return Err(de::Error::custom(invalid_json_number(&self.key))); } - let () = self - .visitor + self.visitor .visit_measurement(self.key.as_ref(), value) .map_err(de::Error::custom)?; @@ -319,7 +316,7 @@ mod tests { let mut builder = ThinEdgeJsonBuilder::default(); - let () = parse_str(input, &mut builder)?; + parse_str(input, &mut builder)?; let output = builder.done()?; diff --git a/crates/core/thin_edge_json/src/serialize.rs b/crates/core/thin_edge_json/src/serialize.rs index 0c307ec0..373d76ec 100644 --- a/crates/core/thin_edge_json/src/serialize.rs +++ b/crates/core/thin_edge_json/src/serialize.rs @@ -67,7 +67,7 @@ impl ThinEdgeJsonSerializer { if !self.timestamp_present { if let Some(default_timestamp) = self.default_timestamp { - let () = self.visit_timestamp(default_timestamp)?; + self.visit_timestamp(default_timestamp)?; } } |