summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2022-02-14 11:24:40 +0100
committerGitHub <noreply@github.com>2022-02-14 11:24:40 +0100
commit51bc60f9c3c6c7461679620a11eff84418be8cc2 (patch)
tree5a248e6ae2500fe1f73195df3fc9b83f289f6ff0
parent53d79c91e6bf90e0986fa8f4a8a2597daec26b79 (diff)
parentaa826ade69d618de004eee653be157c4e9c09d8f (diff)
Merge pull request #865 from matthiasbeyer/clippy-fixes-agent_interface
Clippy fixes for: agent_interface
-rw-r--r--crates/core/agent_interface/src/lib.rs4
-rw-r--r--crates/core/agent_interface/src/messages.rs18
-rw-r--r--crates/core/c8y_smartrest/src/smartrest_deserializer.rs2
-rw-r--r--crates/core/tedge_agent/src/agent.rs2
-rw-r--r--crates/core/tedge_mapper/src/sm_c8y_mapper/mapper.rs4
5 files changed, 18 insertions, 12 deletions
diff --git a/crates/core/agent_interface/src/lib.rs b/crates/core/agent_interface/src/lib.rs
index 2fdcbd9e..147b2e88 100644
--- a/crates/core/agent_interface/src/lib.rs
+++ b/crates/core/agent_interface/src/lib.rs
@@ -50,7 +50,7 @@ mod tests {
#[test]
fn creating_a_software_list_request_with_generated_id() {
- let request = SoftwareListRequest::new();
+ let request = SoftwareListRequest::default();
let generated_id = request.id;
// The generated id is a nanoid of 21 characters from A-Za-z0-9_~
@@ -470,7 +470,7 @@ mod tests {
#[test]
fn creating_a_software_update_request_with_generated_id() {
- let request = SoftwareUpdateRequest::new();
+ let request = SoftwareUpdateRequest::default();
let generated_id = request.id;
// The generated id is a nanoid of 21 characters from A-Za-z0-9_~
diff --git a/crates/core/agent_interface/src/messages.rs b/crates/core/agent_interface/src/messages.rs
index 65c52d13..e124bf78 100644
--- a/crates/core/agent_interface/src/messages.rs
+++ b/crates/core/agent_interface/src/messages.rs
@@ -43,12 +43,14 @@ pub struct SoftwareListRequest {
impl<'a> Jsonify<'a> for SoftwareListRequest {}
-impl SoftwareListRequest {
- pub fn new() -> SoftwareListRequest {
+impl Default for SoftwareListRequest {
+ fn default() -> SoftwareListRequest {
let id = nanoid!();
SoftwareListRequest { id }
}
+}
+impl SoftwareListRequest {
pub fn new_with_id(id: &str) -> SoftwareListRequest {
SoftwareListRequest { id: id.to_string() }
}
@@ -69,15 +71,17 @@ pub struct SoftwareUpdateRequest {
impl<'a> Jsonify<'a> for SoftwareUpdateRequest {}
-impl SoftwareUpdateRequest {
- pub fn new() -> SoftwareUpdateRequest {
+impl Default for SoftwareUpdateRequest {
+ fn default() -> SoftwareUpdateRequest {
let id = nanoid!();
SoftwareUpdateRequest {
id,
update_list: vec![],
}
}
+}
+impl SoftwareUpdateRequest {
pub fn new_with_id(id: &str) -> SoftwareUpdateRequest {
SoftwareUpdateRequest {
id: id.to_string(),
@@ -474,12 +478,14 @@ pub struct RestartOperationRequest {
impl<'a> Jsonify<'a> for RestartOperationRequest {}
-impl RestartOperationRequest {
- pub fn new() -> RestartOperationRequest {
+impl Default for RestartOperationRequest {
+ fn default() -> RestartOperationRequest {
let id = nanoid!();
RestartOperationRequest { id }
}
+}
+impl RestartOperationRequest {
pub fn new_with_id(id: &str) -> RestartOperationRequest {
RestartOperationRequest { id: id.to_string() }
}
diff --git a/crates/core/c8y_smartrest/src/smartrest_deserializer.rs b/crates/core/c8y_smartrest/src/smartrest_deserializer.rs
index a5265279..9d819f8c 100644
--- a/crates/core/c8y_smartrest/src/smartrest_deserializer.rs
+++ b/crates/core/c8y_smartrest/src/smartrest_deserializer.rs
@@ -71,7 +71,7 @@ impl SmartRestUpdateSoftware {
}
pub fn to_thin_edge_json(&self) -> Result<SoftwareUpdateRequest, SmartRestDeserializerError> {
- let request = self.map_to_software_update_request(SoftwareUpdateRequest::new())?;
+ let request = self.map_to_software_update_request(SoftwareUpdateRequest::default())?;
Ok(request)
}
diff --git a/crates/core/tedge_agent/src/agent.rs b/crates/core/tedge_agent/src/agent.rs
index 77c2556e..032612a7 100644
--- a/crates/core/tedge_agent/src/agent.rs
+++ b/crates/core/tedge_agent/src/agent.rs
@@ -466,7 +466,7 @@ impl SmAgent {
.await?;
// update status to executing.
- let executing_response = RestartOperationResponse::new(&RestartOperationRequest::new());
+ let executing_response = RestartOperationResponse::new(&RestartOperationRequest::default());
let () = responses
.publish(Message::new(&topic, executing_response.to_bytes()?))
.await?;
diff --git a/crates/core/tedge_mapper/src/sm_c8y_mapper/mapper.rs b/crates/core/tedge_mapper/src/sm_c8y_mapper/mapper.rs
index 251e0f90..2f91a329 100644
--- a/crates/core/tedge_mapper/src/sm_c8y_mapper/mapper.rs
+++ b/crates/core/tedge_mapper/src/sm_c8y_mapper/mapper.rs
@@ -229,7 +229,7 @@ where
#[instrument(skip(self), name = "software-list")]
async fn ask_software_list(&mut self) -> Result<(), SMCumulocityMapperError> {
- let request = SoftwareListRequest::new();
+ let request = SoftwareListRequest::default();
let topic = Topic::new(RequestTopic::SoftwareListRequest.as_str())?;
let json_list_request = request.to_json()?;
let () = self.publish(&topic, json_list_request).await?;
@@ -438,7 +438,7 @@ where
let topic = Topic::new(RequestTopic::RestartRequest.as_str())?;
let _ = SmartRestRestartRequest::from_smartrest(smartrest)?;
- let request = RestartOperationRequest::new();
+ let request = RestartOperationRequest::default();
let () = self.publish(&topic, request.to_json()?).await?;
Ok(())