chore: use 2024 edition (#135)

Author: obmarg

Cargo.toml

@@ -2,7 +2,7 @@
 name = "graphql-ws-client"
 version = "0.11.1"
 authors = ["Graeme Coupar <graeme@polyandglot.dev>"]
-edition = "2021"
+edition = "2024"
 resolver = "2"
 description = "A graphql over websockets client"
 keywords = ["graphql", "client", "api", "websockets", "subscriptions"]

src/client/actor.rs

@@ -1,21 +1,21 @@
 use std::{
-    collections::{hash_map::Entry, HashMap},
+    collections::{HashMap, hash_map::Entry},
     future::IntoFuture,
 };
 
-use futures_lite::{future, stream, FutureExt, StreamExt};
-use serde_json::{json, Value};
+use futures_lite::{FutureExt, StreamExt, future, stream};
+use serde_json::{Value, json};
 
 use crate::{
+    Error, SubscriptionId,
     logging::{trace, warning},
     protocol::Event,
-    Error, SubscriptionId,
 };
 
 use super::{
+    ConnectionCommand,
     connection::{Message, ObjectSafeConnection},
     keepalive::KeepAliveSettings,
-    ConnectionCommand,
 };
 
 #[must_use]
@@ -110,13 +110,13 @@ impl ConnectionActor {
                 return Some(Message::Close {
                     code: Some(code),
                     reason: Some(reason),
-                })
+                });
             }
             Err(other) => {
                 return Some(Message::Close {
                     code: Some(4857),
                     reason: Some(format!("Error while decoding event: {other}")),
-                })
+                });
             }
         };
 

src/client/builder.rs

@@ -6,14 +6,14 @@ use std::{
 use futures_lite::future;
 use serde::Serialize;
 
-use crate::{graphql::GraphqlOperation, logging::trace, protocol::Event, Error};
+use crate::{Error, graphql::GraphqlOperation, logging::trace, protocol::Event};
 
 use super::{
+    Client, Subscription,
     actor::ConnectionActor,
     connection::{Connection, Message, ObjectSafeConnection},
     keepalive::KeepAliveSettings,
     production_future::read_from_producer,
-    Client, Subscription,
 };
 
 /// Builder for Graphql over Websocket clients
@@ -176,7 +176,7 @@ impl ClientBuilder {
                     return Err(Error::Close(
                         code.unwrap_or_default(),
                         reason.unwrap_or_default(),
-                    ))
+                    ));
                 }
                 Some(Message::Ping | Message::Pong) => {}
                 Some(message @ Message::Text(_)) => {

src/client/keepalive.rs

@@ -1,6 +1,6 @@
 use std::{future::pending, time::Duration};
 
-use futures_lite::{stream, Stream};
+use futures_lite::{Stream, stream};
 
 use crate::ConnectionCommand;
 

src/client/mod.rs

@@ -1,18 +1,18 @@
 use std::{
     fmt,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
 };
 
 use futures_lite::StreamExt;
 use serde_json::Value;
 
 use crate::{
+    Error,
     graphql::GraphqlOperation,
     protocol::{self},
-    Error,
 };
 
 mod actor;

src/client/production_future.rs

@@ -1,6 +1,6 @@
 use std::{future::Future, task::Poll};
 
-use futures_lite::{future, FutureExt};
+use futures_lite::{FutureExt, future};
 
 /// A future that runs a long running producer future while also polling a future
 /// that should be reading a stream generated by that producer future.

src/client/subscription.rs

@@ -3,10 +3,10 @@ use std::{
     task::{Context, Poll},
 };
 
-use futures_lite::{future, stream, Stream, StreamExt};
+use futures_lite::{Stream, StreamExt, future, stream};
 
 use crate::{
-    client::production_future::read_from_producer, graphql::GraphqlOperation, Error, SubscriptionId,
+    Error, SubscriptionId, client::production_future::read_from_producer, graphql::GraphqlOperation,
 };
 
 use super::ConnectionCommand;

src/doc_utils.rs

@@ -1,6 +1,6 @@
 use std::future::Future;
 
-use crate::{client::Message, Error};
+use crate::{Error, client::Message};
 
 pub struct Conn;
 

src/native.rs

@@ -2,7 +2,7 @@ use futures_lite::{Stream, StreamExt};
 use futures_sink::Sink;
 use tungstenite::{self, protocol::CloseFrame};
 
-use crate::{sink_ext::SinkExt, Error, Message};
+use crate::{Error, Message, sink_ext::SinkExt};
 
 #[cfg_attr(docsrs, doc(cfg(feature = "tungstenite")))]
 impl<T> crate::client::Connection for T
@@ -18,15 +18,15 @@ where
         loop {
             match self.next().await? {
                 Ok(tungstenite::Message::Text(text)) => {
-                    return Some(crate::client::Message::Text(text))
+                    return Some(crate::client::Message::Text(text));
                 }
                 Ok(tungstenite::Message::Ping(_)) => return Some(crate::client::Message::Ping),
                 Ok(tungstenite::Message::Pong(_)) => return Some(crate::client::Message::Pong),
                 Ok(tungstenite::Message::Close(frame)) => {
                     return Some(crate::client::Message::Close {
                         code: frame.as_ref().map(|frame| frame.code.into()),
                         reason: frame.map(|frame| frame.reason.to_string()),
-                    })
+                    });
                 }
                 Ok(tungstenite::Message::Frame(_) | tungstenite::Message::Binary(_)) => continue,
                 Err(error) => {

src/ws_stream_wasm.rs

@@ -2,7 +2,7 @@ use futures_lite::{FutureExt, StreamExt};
 use pharos::{Observable, ObserveConfig};
 use ws_stream_wasm::{WsEvent, WsMessage, WsMeta, WsStream};
 
-use crate::{sink_ext::SinkExt, Error};
+use crate::{Error, sink_ext::SinkExt};
 
 /// A websocket connection for [ws_stream_wasm][1]
 ///