Merge pull request #900 from matthiasbeyer/clippy-fixes-tedge_mapper

Clippy fixes for: tedge_mapper

4 files changed, 13 insertions, 12 deletions

diff --git a/crates/core/tedge_mapper/src/c8y/error.rs b/crates/core/tedge_mapper/src/c8y/error.rs
index d7382028..f9623007 100644
--- a/crates/core/tedge_mapper/src/c8y/error.rs
+++ b/crates/core/tedge_mapper/src/c8y/error.rs
@@ -3,6 +3,7 @@ use c8y_smartrest::error::{
 };
 
 #[derive(thiserror::Error, Debug)]
+#[allow(clippy::enum_variant_names)]
 pub enum CumulocityMapperError {
     #[error(transparent)]
     InvalidTopicError(#[from] agent_interface::TopicError),
diff --git a/crates/core/tedge_mapper/src/collectd/collectd.rs b/crates/core/tedge_mapper/src/collectd/collectd.rs
index 0bb0fe22..dd92fdd4 100644
--- a/crates/core/tedge_mapper/src/collectd/collectd.rs
+++ b/crates/core/tedge_mapper/src/collectd/collectd.rs
@@ -123,6 +123,7 @@ struct CollectdPayload {
 }
 
 #[derive(thiserror::Error, Debug)]
+#[allow(clippy::enum_variant_names)]
 pub enum CollectdPayloadError {
     #[error("Invalid payload: {0}. Expected payload format: <timestamp>:<value>")]
     InvalidMeasurementPayloadFormat(String),
@@ -150,16 +151,14 @@ impl CollectdPayload {
             CollectdPayloadError::InvalidMeasurementTimestamp(msg[0].to_string())
         })?;
 
-        let mut metric_values: Vec<f64> = Vec::with_capacity(vec_len - 1);
-
-        // Process the values
-        for i in 1..vec_len {
-            let value = msg[i].parse::<f64>().map_err(|_err| {
-                CollectdPayloadError::InvalidMeasurementValue(msg[i].to_string())
-            })?;
-
-            metric_values.push(value);
-        }
+        let metric_values = msg
+            .into_iter()
+            .skip(1)
+            .map(|m| {
+                m.parse::<f64>()
+                    .map_err(|_err| CollectdPayloadError::InvalidMeasurementValue(m.to_string()))
+            })
+            .collect::<Result<Vec<_>, _>>()?;
 
         Ok(CollectdPayload {
             timestamp,
diff --git a/crates/core/tedge_mapper/src/collectd/error.rs b/crates/core/tedge_mapper/src/collectd/error.rs
index bde540a2..56e54841 100644
--- a/crates/core/tedge_mapper/src/collectd/error.rs
+++ b/crates/core/tedge_mapper/src/collectd/error.rs
@@ -1,6 +1,7 @@
 use tokio::sync::mpsc::error::SendError;
 
 #[derive(thiserror::Error, Debug)]
+#[allow(clippy::enum_variant_names)]
 pub enum DeviceMonitorError {
     #[error(transparent)]
     FromMqttClient(#[from] mqtt_channel::MqttError),
diff --git a/crates/core/tedge_mapper/src/core/mapper.rs b/crates/core/tedge_mapper/src/core/mapper.rs
index 9a39ef41..7f66ed62 100644
--- a/crates/core/tedge_mapper/src/core/mapper.rs
+++ b/crates/core/tedge_mapper/src/core/mapper.rs
@@ -10,8 +10,8 @@ use tracing::{error, info, instrument};
 
 const SYNC_WINDOW: Duration = Duration::from_secs(3);
 
-pub async fn create_mapper<'a>(
-    app_name: &'a str,
+pub async fn create_mapper(
+    app_name: &str,
     mqtt_port: u16,
     converter: Box<dyn Converter<Error = ConversionError>>,
 ) -> Result<Mapper, anyhow::Error> {