Merge pull request #310 from matthiasbeyer/fix-clippy

Fix clippy
TheNeikos · Sep 9, 2024 · 73a33ff · 73a33ff
2 parents a129968 + 01c2379
commit 73a33ff
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 24 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,8 +15,8 @@ categories = ["embedded"]
 [workspace]
 members = ["cloudmqtt-bin", "mqtt-format"]
 
-[features]
-debug = ["winnow/debug"]
+#[features]
+#debug = ["winnow/debug"]
 
 [dependencies]
 futures = "0.3.30"

diff --git a/cloudmqtt-bin/src/bin/client.rs b/cloudmqtt-bin/src/bin/client.rs
@@ -11,7 +11,6 @@ use cloudmqtt::client::connect::MqttClientConnector;
 use cloudmqtt::client::send::Publish;
 use cloudmqtt::client::MqttClient;
 use cloudmqtt::transport::MqttConnectTransport;
-use futures::FutureExt;
 use tokio::net::TcpStream;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
@@ -64,7 +63,7 @@ async fn main() {
         .await
         .unwrap();
     let connected = client.connect(connector).await.unwrap();
-    let background = tokio::task::spawn(connected.background_task);
+    let _background = tokio::task::spawn(connected.background_task);
 
     client
         .publish(Publish {

diff --git a/src/client/mod.rs b/src/client/mod.rs
@@ -14,7 +14,6 @@ use std::sync::Arc;
 
 use futures::lock::Mutex;
 
-use self::send::Acknowledge;
 use self::send::Callbacks;
 use self::send::ClientHandlers;
 use self::state::ConnectState;

diff --git a/src/client/receive.rs b/src/client/receive.rs
@@ -146,7 +146,7 @@ async fn handle_pubcomp(
                 tracing::trace!("Removed packet id from outstanding packets");
 
                 if let Some(callback) = inner.outstanding_callbacks.take_qos2_complete(pident) {
-                    if let Err(_) = callback.on_complete.send(packet.clone()) {
+                    if callback.on_complete.send(packet.clone()).is_err() {
                         tracing::trace!("Could not send ack, receiver was dropped.")
                     }
                 } else {
@@ -178,8 +178,7 @@ async fn handle_puback(
                 todo!()
             };
 
-            let pident = PacketIdentifier::try_from(mpuback.packet_identifier)
-                .expect("Zero PacketIdentifier not valid here");
+            let pident = PacketIdentifier::from(mpuback.packet_identifier);
             tracing::Span::current().record("packet_identifier", tracing::field::display(pident));
 
             if session_state
@@ -190,7 +189,7 @@ async fn handle_puback(
                 tracing::trace!("Removed packet id from outstanding packets");
 
                 if let Some(callback) = inner.outstanding_callbacks.take_qos1(pident) {
-                    if let Err(_) = callback.on_acknowledge.send(puback.clone()) {
+                    if callback.on_acknowledge.send(puback.clone()).is_err() {
                         tracing::trace!("Could not send ack, receiver was dropped.")
                     }
                 }
@@ -225,8 +224,7 @@ async fn handle_pubrec(
                 tracing::error!("No session state found");
                 todo!()
             };
-            let pident = PacketIdentifier::try_from(pubrec.packet_identifier)
-                .expect("zero PacketIdentifier not valid here");
+            let pident = PacketIdentifier::from(pubrec.packet_identifier);
             tracing::Span::current().record("packet_identifier", tracing::field::display(pident));
 
             if session_state
@@ -257,7 +255,7 @@ async fn handle_pubrec(
                 conn_state.conn_write.send(pubrel).await.map_err(drop)?;
 
                 if let Some(callback) = inner.outstanding_callbacks.take_qos2_receive(pident) {
-                    if let Err(_) = callback.on_receive.send(packet.clone()) {
+                    if callback.on_receive.send(packet.clone()).is_err() {
                         tracing::trace!("Could not send ack, receiver was dropped.")
                     }
                 } else {

diff --git a/src/client/send.rs b/src/client/send.rs
@@ -7,7 +7,6 @@
 use std::collections::HashMap;
 use std::collections::VecDeque;
 
-use futures::FutureExt;
 use mqtt_format::v5::integers::VARIABLE_INTEGER_MAX;
 use mqtt_format::v5::packets::publish::MPublish;
 use tracing::Instrument;
@@ -221,6 +220,7 @@ pub(crate) struct ClientHandlers {
 }
 
 pub type OnPacketRecvFn = Box<dyn Fn(crate::packets::MqttPacket) + Send>;
+pub type OnPacketRefRecvFn = Box<dyn Fn(&crate::packets::MqttPacket) + Send>;
 pub type OnQos1AcknowledgeFn = Box<dyn Fn(crate::packets::Puback) + Send>;
 
 impl Default for ClientHandlers {
@@ -313,7 +313,7 @@ pub struct Publish {
     pub qos: QualityOfService,
     pub retain: bool,
     pub payload: MqttPayload,
-    pub on_packet_recv: Option<Box<dyn Fn(&crate::packets::MqttPacket) + Send>>,
+    pub on_packet_recv: Option<OnPacketRefRecvFn>,
 }
 
 pub struct Published {
@@ -379,14 +379,11 @@ pub struct PublishQos1 {
     pub topic: crate::topic::MqttTopic,
     pub retain: bool,
     pub payload: MqttPayload,
-    on_packet_recv: Option<Box<dyn Fn(&crate::packets::MqttPacket) + Send>>,
+    on_packet_recv: Option<OnPacketRefRecvFn>,
 }
 
 impl PublishQos1 {
-    pub fn with_on_packet_recv(
-        mut self,
-        on_packet_recv: Box<dyn Fn(&crate::packets::MqttPacket) + Send>,
-    ) -> Self {
+    pub fn with_on_packet_recv(mut self, on_packet_recv: OnPacketRefRecvFn) -> Self {
         self.on_packet_recv = Some(on_packet_recv);
         self
     }
@@ -396,14 +393,11 @@ pub struct PublishQos2 {
     pub topic: crate::topic::MqttTopic,
     pub retain: bool,
     pub payload: MqttPayload,
-    on_packet_recv: Option<Box<dyn Fn(&crate::packets::MqttPacket) + Send>>,
+    on_packet_recv: Option<OnPacketRefRecvFn>,
 }
 
 impl PublishQos2 {
-    pub fn with_on_packet_recv(
-        mut self,
-        on_packet_recv: Box<dyn Fn(&crate::packets::MqttPacket) + Send>,
-    ) -> Self {
+    pub fn with_on_packet_recv(mut self, on_packet_recv: OnPacketRefRecvFn) -> Self {
         self.on_packet_recv = Some(on_packet_recv);
         self
     }

diff --git a/src/client/state.rs b/src/client/state.rs
@@ -48,6 +48,7 @@ impl TransportWriter {
     }
 }
 
+#[allow(unused)]
 pub(super) struct ConnectState {
     pub(super) session_present: bool,
     pub(super) receive_maximum: Option<NonZeroU16>,
@@ -66,6 +67,7 @@ pub(super) struct ConnectState {
 }
 
 pub(super) struct SessionState {
+    #[allow(unused)]
     pub(super) client_identifier: MqttString,
     pub(super) outstanding_packets: OutstandingPackets,
 }
@@ -111,6 +113,7 @@ impl OutstandingPackets {
         self.outstanding_packets.contains_key(&ident)
     }
 
+    #[allow(unused)]
     pub fn iter_in_send_order(
         &self,
     ) -> impl Iterator<Item = (PacketIdentifier, &crate::packets::MqttPacket)> {