refactor: cargo clippy (#349)

Totodore · Jul 16, 2024 · d796728 · d796728
1 parent ae14651
commit d796728
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 123 deletions.
diff --git a/e2e/heaptrack/src/client.rs b/e2e/heaptrack/src/client.rs
@@ -16,9 +16,7 @@ fn cb(_: Payload, socket: Client) -> Pin<Box<dyn std::future::Future<Output = ()
             loop {
                 inter.tick().await;
                 let _ = socket.emit("ping", serde_json::Value::Null).await;
-                let _ = socket
-                    .emit("ping", (0..u8::MAX).into_iter().collect::<Vec<u8>>())
-                    .await;
+                let _ = socket.emit("ping", (0..u8::MAX).collect::<Vec<u8>>()).await;
             }
         });
     })

diff --git a/engineioxide/benches/packet_encode.rs b/engineioxide/benches/packet_encode.rs
@@ -12,39 +12,39 @@ fn criterion_benchmark(c: &mut Criterion) {
         ));
         b.iter_batched(
             || packet.clone(),
-            |p| TryInto::<String>::try_into(p),
+            TryInto::<String>::try_into,
             BatchSize::SmallInput,
         )
     });
     group.bench_function("Encode packet ping/pong", |b| {
         let packet = Packet::Ping;
         b.iter_batched(
             || packet.clone(),
-            |p| TryInto::<String>::try_into(p),
+            TryInto::<String>::try_into,
             BatchSize::SmallInput,
         )
     });
     group.bench_function("Encode packet ping/pong upgrade", |b| {
         let packet = Packet::PingUpgrade;
         b.iter_batched(
             || packet.clone(),
-            |p| TryInto::<String>::try_into(p),
+            TryInto::<String>::try_into,
             BatchSize::SmallInput,
         )
     });
     group.bench_function("Encode packet message", |b| {
         let packet = Packet::Message(black_box("Hello").into());
         b.iter_batched(
             || packet.clone(),
-            |p| TryInto::<String>::try_into(p),
+            TryInto::<String>::try_into,
             BatchSize::SmallInput,
         )
     });
     group.bench_function("Encode packet noop", |b| {
         let packet = Packet::Noop;
         b.iter_batched(
             || packet.clone(),
-            |p| TryInto::<String>::try_into(p),
+            TryInto::<String>::try_into,
             BatchSize::SmallInput,
         )
     });
@@ -53,7 +53,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         let packet = Packet::Binary(BYTES);
         b.iter_batched(
             || packet.clone(),
-            |p| TryInto::<String>::try_into(p),
+            TryInto::<String>::try_into,
             BatchSize::SmallInput,
         )
     });

diff --git a/engineioxide/src/transport/polling/payload/decoder.rs b/engineioxide/src/transport/polling/payload/decoder.rs
@@ -379,7 +379,7 @@ mod tests {
             payload.next().await.unwrap().unwrap(),
             Packet::Message(msg) if msg == "f"
         ));
-        assert_eq!(payload.next().await.is_none(), true);
+        assert!(payload.next().await.is_none());
     }
 
     #[tokio::test]
@@ -406,7 +406,7 @@ mod tests {
                 payload.next().await.unwrap().unwrap(),
                 Packet::Message(msg) if msg == "fo"
             ));
-            assert_eq!(payload.next().await.is_none(), true);
+            assert!(payload.next().await.is_none());
         }
     }
 

diff --git a/engineioxide/src/transport/polling/payload/mod.rs b/engineioxide/src/transport/polling/payload/mod.rs
@@ -54,6 +54,7 @@ pub fn decoder(
 }
 
 /// A payload to transmit to the client through http polling
+#[non_exhaustive]
 pub struct Payload {
     pub data: Bytes,
     pub has_binary: bool,

diff --git a/engineioxide/tests/fixture.rs b/engineioxide/tests/fixture.rs
@@ -62,7 +62,13 @@ pub async fn send_req(
 }
 
 pub async fn create_polling_connection(port: u16) -> String {
-    let body = send_req(port, format!("transport=polling"), http::Method::GET, None).await;
+    let body = send_req(
+        port,
+        "transport=polling".to_string(),
+        http::Method::GET,
+        None,
+    )
+    .await;
     let open_packet: OpenPacket = serde_json::from_str(&body).unwrap();
     open_packet.sid
 }

diff --git a/socketioxide/benches/packet_decode.rs b/socketioxide/benches/packet_decode.rs
@@ -9,9 +9,7 @@ fn criterion_benchmark(c: &mut Criterion) {
     let mut group = c.benchmark_group("socketio_packet/decode");
     group.bench_function("Decode packet connect on /", |b| {
         let packet: String =
-            Packet::connect(black_box("/"), black_box(Sid::ZERO), ProtocolVersion::V5)
-                .try_into()
-                .unwrap();
+            Packet::connect(black_box("/"), black_box(Sid::ZERO), ProtocolVersion::V5).into();
         b.iter(|| Packet::try_from(packet.clone()).unwrap())
     });
     group.bench_function("Decode packet connect on /custom_nsp", |b| {
@@ -20,8 +18,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box(Sid::ZERO),
             ProtocolVersion::V5,
         )
-        .try_into()
-        .unwrap();
+        .into();
         b.iter(|| Packet::try_from(packet.clone()).unwrap())
     });
 
@@ -30,9 +27,7 @@ fn criterion_benchmark(c: &mut Criterion) {
     group.bench_function("Decode packet event on /", |b| {
         let data = serde_json::to_value(DATA).unwrap();
         let packet: String =
-            Packet::event(black_box("/"), black_box("event"), black_box(data.clone()))
-                .try_into()
-                .unwrap();
+            Packet::event(black_box("/"), black_box("event"), black_box(data.clone())).into();
         b.iter(|| Packet::try_from(packet.clone()).unwrap())
     });
 
@@ -43,8 +38,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box("event"),
             black_box(data.clone()),
         )
-        .try_into()
-        .unwrap();
+        .into();
         b.iter(|| Packet::try_from(packet.clone()).unwrap())
     });
 
@@ -56,7 +50,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             PacketData::Event(_, _, mut ack) => ack.insert(black_box(0)),
             _ => panic!("Wrong packet type"),
         };
-        let packet: String = packet.try_into().unwrap();
+        let packet: String = packet.into();
         b.iter(|| Packet::try_from(packet.clone()).unwrap())
     });
 
@@ -71,16 +65,15 @@ fn criterion_benchmark(c: &mut Criterion) {
             PacketData::Event(_, _, mut ack) => ack.insert(black_box(0)),
             _ => panic!("Wrong packet type"),
         };
-        let packet: String = packet.try_into().unwrap();
+        let packet: String = packet.into();
 
         b.iter(|| Packet::try_from(packet.clone()).unwrap())
     });
 
     group.bench_function("Decode packet ack on /", |b| {
         let data = serde_json::to_value(DATA).unwrap();
-        let packet: String = Packet::ack(black_box("/"), black_box(data.clone()), black_box(0))
-            .try_into()
-            .unwrap();
+        let packet: String =
+            Packet::ack(black_box("/"), black_box(data.clone()), black_box(0)).into();
         b.iter(|| Packet::try_from(packet.clone()).unwrap())
     });
 
@@ -91,8 +84,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box(data.clone()),
             black_box(0),
         )
-        .try_into()
-        .unwrap();
+        .into();
         b.iter(|| Packet::try_from(packet.clone()).unwrap())
     });
 
@@ -104,8 +96,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box(data.clone()),
             black_box(vec![BINARY.clone()]),
         )
-        .try_into()
-        .unwrap();
+        .into();
         b.iter(|| Packet::try_from(packet.clone()).unwrap())
     });
 
@@ -117,8 +108,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box(data.clone()),
             black_box(vec![BINARY.clone()]),
         )
-        .try_into()
-        .unwrap();
+        .into();
         b.iter(|| Packet::try_from(packet.clone()).unwrap())
     });
 
@@ -130,8 +120,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box(vec![BINARY.clone()]),
             black_box(0),
         )
-        .try_into()
-        .unwrap();
+        .into();
         b.iter(|| Packet::try_from(packet.clone()).unwrap())
     });
 
@@ -143,8 +132,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box(vec![BINARY.clone()]),
             black_box(0),
         )
-        .try_into()
-        .unwrap();
+        .into();
         b.iter(|| Packet::try_from(packet.clone()).unwrap())
     });
 

diff --git a/socketioxide/benches/packet_encode.rs b/socketioxide/benches/packet_encode.rs
@@ -10,7 +10,7 @@ fn criterion_benchmark(c: &mut Criterion) {
     group.bench_function("Encode packet connect on /", |b| {
         let packet = Packet::connect(black_box("/"), black_box(Sid::ZERO), ProtocolVersion::V5);
         b.iter(|| {
-            let _: String = packet.clone().try_into().unwrap();
+            let _: String = packet.clone().into();
         })
     });
     group.bench_function("Encode packet connect on /custom_nsp", |b| {
@@ -20,7 +20,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             ProtocolVersion::V5,
         );
         b.iter(|| {
-            let _: String = packet.clone().try_into().unwrap();
+            let _: String = packet.clone().into();
         })
     });
 
@@ -31,7 +31,7 @@ fn criterion_benchmark(c: &mut Criterion) {
         let data = serde_json::to_value(DATA).unwrap();
         let packet = Packet::event(black_box("/"), black_box("event"), black_box(data.clone()));
         b.iter(|| {
-            let _: String = packet.clone().try_into().unwrap();
+            let _: String = packet.clone().into();
         })
     });
 
@@ -43,7 +43,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box(data.clone()),
         );
         b.iter(|| {
-            let _: String = packet.clone().try_into().unwrap();
+            let _: String = packet.clone().into();
         })
     });
 
@@ -55,7 +55,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             _ => panic!("Wrong packet type"),
         };
         b.iter(|| {
-            let _: String = packet.clone().try_into().unwrap();
+            let _: String = packet.clone().into();
         })
     });
 
@@ -71,15 +71,15 @@ fn criterion_benchmark(c: &mut Criterion) {
             _ => panic!("Wrong packet type"),
         };
         b.iter(|| {
-            let _: String = packet.clone().try_into().unwrap();
+            let _: String = packet.clone().into();
         })
     });
 
     group.bench_function("Encode packet ack on /", |b| {
         let data = serde_json::to_value(DATA).unwrap();
         let packet = Packet::ack(black_box("/"), black_box(data.clone()), black_box(0));
         b.iter(|| {
-            let _: String = packet.clone().try_into().unwrap();
+            let _: String = packet.clone().into();
         })
     });
 
@@ -91,7 +91,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box(0),
         );
         b.iter(|| {
-            let _: String = packet.clone().try_into().unwrap();
+            let _: String = packet.clone().into();
         })
     });
 
@@ -104,7 +104,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box(vec![BINARY.clone()]),
         );
         b.iter(|| {
-            let _: String = packet.clone().try_into().unwrap();
+            let _: String = packet.clone().into();
         })
     });
 
@@ -117,7 +117,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box(vec![BINARY.clone()]),
         );
         b.iter(|| {
-            let _: String = packet.clone().try_into().unwrap();
+            let _: String = packet.clone().into();
         })
     });
 
@@ -130,7 +130,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box(0),
         );
         b.iter(|| {
-            let _: String = packet.clone().try_into().unwrap();
+            let _: String = packet.clone().into();
         })
     });
 
@@ -143,7 +143,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             black_box(0),
         );
         b.iter(|| {
-            let _: String = packet.clone().try_into().unwrap();
+            let _: String = packet.clone().into();
         })
     });
 

diff --git a/socketioxide/src/ack.rs b/socketioxide/src/ack.rs
@@ -318,7 +318,7 @@ mod test {
 
     fn create_socket() -> Arc<Socket<LocalAdapter>> {
         let sid = Sid::new();
-        let ns = Namespace::<LocalAdapter>::new_dummy([sid]).into();
+        let ns = Namespace::<LocalAdapter>::new_dummy([sid]);
         let socket = Socket::new_dummy(sid, ns);
         socket.into()
     }
@@ -338,8 +338,8 @@ mod test {
 
         futures_util::pin_mut!(stream);
 
-        assert!(matches!(stream.next().await.unwrap().1, Ok(_)));
-        assert!(matches!(stream.next().await.unwrap().1, Ok(_)));
+        assert!(stream.next().await.unwrap().1.is_ok());
+        assert!(stream.next().await.unwrap().1.is_ok());
         assert!(stream.next().await.is_none());
     }
 
@@ -459,7 +459,7 @@ mod test {
 
         let (id, ack) = stream.next().await.unwrap();
         assert_eq!(id, socket.id);
-        assert!(matches!(ack, Ok(_)));
+        assert!(ack.is_ok());
 
         let sid = socket2.id;
         socket2.disconnect().unwrap();
@@ -514,7 +514,7 @@ mod test {
 
         futures_util::pin_mut!(stream);
 
-        assert!(matches!(stream.next().await.unwrap().1, Ok(_)));
+        assert!(stream.next().await.unwrap().1.is_ok());
         assert!(matches!(
             stream.next().await.unwrap().1.unwrap_err(),
             AckError::Timeout

diff --git a/socketioxide/src/client.rs b/socketioxide/src/client.rs
@@ -433,7 +433,7 @@ mod test {
         let client = create_client();
         let ns = Namespace::new(Str::from("/"), || {});
         client.nsps.write().unwrap().insert(Str::from("/"), ns);
-        assert!(matches!(client.get_ns("/"), Some(_)));
+        assert!(client.get_ns("/").is_some());
     }
 
     #[tokio::test]