Merge pull request #32 from swimos/bounds

Relaxes bounds when creating sockets
swimos · Jun 28, 2024 · ce819ff · ce819ff
2 parents bbd9433 + 483779e
commit ce819ff
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 16 deletions.
diff --git a/ratchet_core/Cargo.toml b/ratchet_core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ratchet_core"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2021"
 description = "Async WebSocket implementation"
@@ -16,7 +16,7 @@ split = ["futures"]
 fixture = []
 
 [dependencies]
-ratchet_ext = { version = "1.0.1", path = "../ratchet_ext" }
+ratchet_ext = { version = "1.0.2", path = "../ratchet_ext" }
 url = { workspace = true }
 http = { workspace = true }
 tokio = { workspace = true, features = ["rt", "net", "io-util"] }

diff --git a/ratchet_core/src/framed/mod.rs b/ratchet_core/src/framed/mod.rs
@@ -433,10 +433,7 @@ pub struct FramedIo<I> {
     max_message_size: usize,
 }
 
-impl<I> FramedIo<I>
-where
-    I: WebSocketStream,
-{
+impl<I> FramedIo<I> {
     #[cfg(feature = "split")]
     pub fn from_parts(parts: FramedIoParts<I>) -> FramedIo<I> {
         let FramedIoParts {
@@ -497,7 +494,12 @@ where
     pub fn is_server(&self) -> bool {
         self.flags.contains(CodecFlags::ROLE)
     }
+}
 
+impl<I> FramedIo<I>
+where
+    I: WebSocketStream,
+{
     pub async fn flush(&mut self) -> Result<(), Error> {
         self.io.flush().await?;
         Ok(())

diff --git a/ratchet_core/src/ws.rs b/ratchet_core/src/ws.rs
@@ -96,7 +96,6 @@ pub enum CloseState {
 
 impl<S, E> WebSocket<S, E>
 where
-    S: WebSocketStream,
     E: Extension,
 {
     #[cfg(feature = "split")]
@@ -144,7 +143,13 @@ where
             close_state: CloseState::NotClosed,
         }
     }
+}
 
+impl<S, E> WebSocket<S, E>
+where
+    S: WebSocketStream,
+    E: Extension,
+{
     /// Returns the role of this WebSocket.
     pub fn role(&self) -> Role {
         if self.framed.is_server() {

diff --git a/ratchet_deflate/Cargo.toml b/ratchet_deflate/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ratchet_deflate"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2021"
 description = "Permessage Deflate for Ratchet"
@@ -11,7 +11,7 @@ readme = "README.md"
 repository = "https://github.com/swimos/ratchet/"
 
 [dependencies]
-ratchet_ext = { version = "1.0.1", path = "../ratchet_ext" }
+ratchet_ext = { version = "1.0.2", path = "../ratchet_ext" }
 thiserror = { workspace = true }
 http = { workspace = true }
 bytes = { workspace = true }

diff --git a/ratchet_ext/Cargo.toml b/ratchet_ext/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ratchet_ext"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2021"
 description = "WebSocket extensions for Ratchet"

diff --git a/ratchet_fixture/Cargo.toml b/ratchet_fixture/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ratchet_fixture"
-version = "1.0.1"
+version = "1.0.2"
 edition = "2021"
 description = "Ratchet fixture"
 keywords = ["websocket", "async", "futures", "tokio"]
@@ -10,7 +10,7 @@ readme = "README.md"
 repository = "https://github.com/swimos/ratchet/"
 
 [dependencies]
-ratchet = { package = "ratchet_rs", version = "1.0.1", path = "../ratchet_rs", features = ["split", "deflate", "fixture"] }
+ratchet = { package = "ratchet_rs", version = "1.0.2", path = "../ratchet_rs", features = ["split", "deflate", "fixture"] }
 tokio = { workspace = true, features = ["io-util"] }
 bytes = { workspace = true }
 futures = { workspace = true }

diff --git a/ratchet_rs/Cargo.toml b/ratchet_rs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ratchet_rs"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2021"
 description = "Async WebSocket implementation"
@@ -17,9 +17,9 @@ split = ["ratchet_core/split"]
 fixture = ["ratchet_core/fixture"]
 
 [dependencies]
-ratchet_core = { version = "1.0.1", path = "../ratchet_core" }
-ratchet_ext = { version = "1.0.1", path = "../ratchet_ext" }
-ratchet_deflate = { version = "1.0.1", path = "../ratchet_deflate", optional = true }
+ratchet_core = { version = "1.0.2", path = "../ratchet_core" }
+ratchet_ext = { version = "1.0.2", path = "../ratchet_ext" }
+ratchet_deflate = { version = "1.0.2", path = "../ratchet_deflate", optional = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 log = { workspace = true }