Miscellaneous fixups

Signed-off-by: Jens Reidel <adrian@travitia.xyz>

README.md

@@ -60,7 +60,7 @@ This is a simple websocket echo server without any proper error handling.
 More examples can be found in the [examples folder](https://github.com/Gelbpunkt/tokio-websockets/tree/main/examples).
 
 ```rust
-use futures_util::SinkExt;
+use futures_util::{SinkExt, StreamExt};
 use http::Uri;
 use tokio::net::TcpListener;
 use tokio_websockets::{ClientBuilder, Error, Message, ServerBuilder};
@@ -91,7 +91,7 @@ async fn main() -> Result<(), Error> {
   });
 
   let uri = Uri::from_static("ws://127.0.0.1:3000");
-  let mut client = ClientBuilder::from_uri(uri).connect().await?;
+  let (mut client, _) = ClientBuilder::from_uri(uri).connect().await?;
 
   client.send(Message::text(String::from("Hello world!"))).await?;
 

src/proto.rs

@@ -581,9 +581,7 @@ impl StreamState {
 
 /// A websocket stream that full messages can be read from and written to.
 ///
-/// The stream implements [`futures_util::Sink`], but due to language
-/// limitations it currently does not implement [`futures_util::Stream`]. A
-/// [`WebsocketStream::next`] method serves as a replacement.
+/// The stream implements [`futures_util::Sink`] and [`futures_util::Stream`].
 ///
 /// You must use a [`ClientBuilder`] or [`ServerBuilder`] to
 /// obtain a websocket stream.
@@ -756,9 +754,7 @@ where
         }
 
         // Encode it into the buffer
-        if let Err(e) = self.as_mut().start_send(message) {
-            return Err(e);
-        }
+        self.as_mut().start_send(message)?;
 
         // Attempt to write other pending messages
         self.as_mut().try_write_pending(cx)?;

tests/cancellation_safety.rs

@@ -70,7 +70,7 @@ impl AsyncWrite for SuperSlow {
     }
 }
 
-const TO_SEND: &'static [u8] = &[1, 2, 3, 4];
+const TO_SEND: &[u8] = &[1, 2, 3, 4];
 
 #[tokio::test]
 async fn test_cancellation_safety() {
@@ -83,11 +83,7 @@ async fn test_cancellation_safety() {
     loop {
         // Cancellable futures should be possible to re-create at any time and resume as
         // if they were created once and then polled a few times
-        let recv_fut = server.next();
-        tokio::pin!(recv_fut);
-
-        // Poll the future once
-        if let Poll::Ready(val) = recv_fut.poll_unpin(&mut cx) {
+        if let Poll::Ready(val) = server.next().poll_unpin(&mut cx) {
             let msg = val.expect("eof").expect("err");
             assert_eq!(msg.as_data(), TO_SEND);
             break;