Merge pull request #275 from alexgeek/example-imports

Use re-exported tungstenite types so its easier to copy examples and …
snapview · Apr 16, 2023 · 1c97eb7 · 1c97eb7
2 parents db99615 + f153688
commit 1c97eb7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/examples/autobahn-server.rs b/examples/autobahn-server.rs
@@ -2,8 +2,10 @@ use futures_util::{SinkExt, StreamExt};
 use log::*;
 use std::net::SocketAddr;
 use tokio::net::{TcpListener, TcpStream};
-use tokio_tungstenite::{accept_async, tungstenite::Error};
-use tungstenite::Result;
+use tokio_tungstenite::{
+    accept_async,
+    tungstenite::{Error, Result},
+};
 
 async fn accept_connection(peer: SocketAddr, stream: TcpStream) {
     if let Err(e) = handle_connection(peer, stream).await {

diff --git a/examples/interval-server.rs b/examples/interval-server.rs
@@ -2,8 +2,10 @@ use futures_util::{SinkExt, StreamExt};
 use log::*;
 use std::{net::SocketAddr, time::Duration};
 use tokio::net::{TcpListener, TcpStream};
-use tokio_tungstenite::{accept_async, tungstenite::Error};
-use tungstenite::{Message, Result};
+use tokio_tungstenite::{
+    accept_async,
+    tungstenite::{Error, Message, Result},
+};
 
 async fn accept_connection(peer: SocketAddr, stream: TcpStream) {
     if let Err(e) = handle_connection(peer, stream).await {

diff --git a/examples/server-custom-accept.rs b/examples/server-custom-accept.rs
@@ -39,10 +39,12 @@ use hyper::{
 use futures_channel::mpsc::{unbounded, UnboundedSender};
 use futures_util::{future, pin_mut, stream::TryStreamExt, StreamExt};
 
-use tokio_tungstenite::WebSocketStream;
-use tungstenite::{
-    handshake::derive_accept_key,
-    protocol::{Message, Role},
+use tokio_tungstenite::{
+    tungstenite::{
+        handshake::derive_accept_key,
+        protocol::{Message, Role},
+    },
+    WebSocketStream,
 };
 
 type Tx = UnboundedSender<Message>;

diff --git a/examples/server.rs b/examples/server.rs
@@ -29,7 +29,7 @@ use futures_channel::mpsc::{unbounded, UnboundedSender};
 use futures_util::{future, pin_mut, stream::TryStreamExt, StreamExt};
 
 use tokio::net::{TcpListener, TcpStream};
-use tungstenite::protocol::Message;
+use tokio_tungstenite::tungstenite::protocol::Message;
 
 type Tx = UnboundedSender<Message>;
 type PeerMap = Arc<Mutex<HashMap<SocketAddr, Tx>>>;