Update to Rust 1.80.0

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.78.0
+          toolchain: 1.80.0
       - uses: Swatinem/rust-cache@v2
       - name: Test
         run: cargo test --all-features --all-targets --workspace

ratchet_core/src/split/bilock/mod.rs

@@ -96,7 +96,7 @@ impl<T> BiLock<T> {
 
     /// Reunites two `BiLock`s that form a pair or returns an error if they do not guard the same
     /// value.
-    pub fn reunite(self, other: BiLock<T>) -> Result<T, ReuniteError<T>>
+    pub fn reunite(self, other: BiLock<T>) -> Result<T, ReuniteError<BiLock<T>>>
     where
         T: Unpin,
     {
@@ -151,7 +151,7 @@ impl<T: Unpin> DerefMut for BiLockGuard<'_, T> {
     }
 }
 
-pub struct ReuniteError<T>(pub BiLock<T>, pub BiLock<T>);
+pub struct ReuniteError<T>(pub T, pub T);
 
 impl<T> Debug for ReuniteError<T> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
@@ -160,7 +160,7 @@ impl<T> Debug for ReuniteError<T> {
 }
 
 impl<T> Display for ReuniteError<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         write!(f, "Attempted to reunite two BiLocks that don't form a pair")
     }
 }

ratchet_rs/examples/server.rs

@@ -17,8 +17,7 @@ use ratchet_rs::{
     Error, Message, NoExtProvider, PayloadType, ProtocolRegistry, UpgradedServer, WebSocketConfig,
 };
 use tokio::net::TcpListener;
-use tokio_stream::wrappers::TcpListenerStream;
-use tokio_stream::StreamExt;
+use tokio_stream::{wrappers::TcpListenerStream, StreamExt};
 
 #[tokio::main]
 async fn main() -> Result<(), Error> {

ratchet_rs/src/lib.rs

@@ -19,7 +19,7 @@
 //! # Features
 //! - Implement your own own extensions using [ratchet_ext](../ratchet_ext).
 //! - Per-message deflate with [ratchet_deflate](../ratchet_deflate) or enable with the `deflate`
-//! feature.
+//!   feature.
 //! - Split WebSocket with the `split` feature.
 //!
 //! # Error handling