Merge branch 'feature/plugin_mqtt/fix-clippy' into feature/add_tedge_api_impl

4 files changed, 7 insertions, 9 deletions

diff --git a/plugins/plugin_mqtt/src/builder.rs b/plugins/plugin_mqtt/src/builder.rs
index 2bdcece1..0d0d3054 100644
--- a/plugins/plugin_mqtt/src/builder.rs
+++ b/plugins/plugin_mqtt/src/builder.rs
@@ -13,8 +13,8 @@ use crate::plugin::MqttPlugin;
 
 pub struct MqttPluginBuilder;
 
-impl MqttPluginBuilder {
-    pub fn new() -> Self {
+impl Default for MqttPluginBuilder {
+    fn default() -> Self {
         MqttPluginBuilder
     }
 }
diff --git a/plugins/plugin_mqtt/src/config.rs b/plugins/plugin_mqtt/src/config.rs
index 5a7c684e..2bb5b508 100644
--- a/plugins/plugin_mqtt/src/config.rs
+++ b/plugins/plugin_mqtt/src/config.rs
@@ -22,6 +22,7 @@ pub struct Subscription {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, serde::Deserialize)]
+#[allow(clippy::enum_variant_names)]
 pub enum QoS {
     #[serde(rename = "at_most_once")]
     AtMostOnce,
@@ -62,9 +63,9 @@ impl tedge_api::AsConfig for QoS {
     }
 }
 
-impl Into<i32> for QoS {
-    fn into(self) -> i32 {
-        match self {
+impl From<QoS> for i32 {
+    fn from(qos: QoS) -> i32 {
+        match qos {
             QoS::AtMostOnce => paho_mqtt::QOS_0,
             QoS::AtLeastOnce => paho_mqtt::QOS_1,
             QoS::ExactlyOnce => paho_mqtt::QOS_2,
diff --git a/plugins/plugin_mqtt/src/error.rs b/plugins/plugin_mqtt/src/error.rs
index f2301a06..7250e11b 100644
--- a/plugins/plugin_mqtt/src/error.rs
+++ b/plugins/plugin_mqtt/src/error.rs
@@ -9,9 +9,6 @@ pub(crate) enum Error {
     #[error("No client, cannot send messages")]
     NoClient,
 
-    #[error("Failed to stop MQTT mainloop")]
-    FailedToStopMqttMainloop,
-
     #[error("Failed to disconnect MQTT client")]
     FailedToDisconnectMqttClient(paho_mqtt::errors::Error),
 }
diff --git a/plugins/plugin_mqtt/src/plugin.rs b/plugins/plugin_mqtt/src/plugin.rs
index b1d2143e..5782f1ee 100644
--- a/plugins/plugin_mqtt/src/plugin.rs
+++ b/plugins/plugin_mqtt/src/plugin.rs
@@ -106,7 +106,7 @@ impl Plugin for MqttPlugin {
                 .disconnect(None)
                 .instrument(tracing::debug_span!("plugin.mqtt.client.disconnect"))
                 .await
-                .map_err(|e| crate::error::Error::FailedToDisconnectMqttClient(e))?;
+                .map_err(crate::error::Error::FailedToDisconnectMqttClient)?;
         }
 
         Ok(())