io: make duplex stream cooperative (tokio-rs#4470)

Add coop checks on pipe poll_read and poll_write. Fixes: tokio-rs#4470 Refs: tokio-rs#4291, tokio-rs#4300
GongLG · Feb 8, 2022 · 26c26c4 · 26c26c4
1 parent 40416b3
commit 26c26c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tokio/src/io/util/mem.rs b/tokio/src/io/util/mem.rs
@@ -245,7 +245,7 @@ impl AsyncRead for Pipe {
 
     cfg_not_coop! {
         fn poll_read(
-            mut self: Pin<&mut Self>,
+            self: Pin<&mut Self>,
             cx: &mut task::Context<'_>,
             buf: &mut ReadBuf<'_>,
         ) -> Poll<std::io::Result<()>> {
@@ -273,7 +273,7 @@ impl AsyncWrite for Pipe {
 
     cfg_not_coop! {
         fn poll_write(
-            mut self: Pin<&mut Self>,
+            self: Pin<&mut Self>,
             cx: &mut task::Context<'_>,
             buf: &[u8],
         ) -> Poll<std::io::Result<usize>> {

diff --git a/tokio/tests/io_mem_stream.rs b/tokio/tests/io_mem_stream.rs
@@ -111,9 +111,9 @@ async fn duplex_is_cooperative() {
         _ = async {
             loop {
                 let buf = [3u8; 4096];
-                let _ = tx.write_all(&buf).await;
+                tx.write_all(&buf).await.unwrap();
                 let mut buf = [0u8; 4096];
-                let _ = rx.read(&mut buf).await;
+                rx.read(&mut buf).await.unwrap();
             }
         } => {},
         _ = tokio::task::yield_now() => {}