From dfc8e66adefadda54ed5f31a85d0c3baadecb43e Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Fri, 28 Jan 2022 18:27:23 +0100 Subject: [PATCH 1/2] io: add test for take bug --- tokio/tests/io_take.rs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tokio/tests/io_take.rs b/tokio/tests/io_take.rs index 45c61f276b1..28342b4651e 100644 --- a/tokio/tests/io_take.rs +++ b/tokio/tests/io_take.rs @@ -17,6 +17,21 @@ async fn take() { assert_eq!(&buf, &b"hell\0\0"[..]); } +#[tokio::test] +async fn issue_4435() { + let mut buf = [0; 8]; + let rd: &[u8] = b"hello world"; + + let rd = rd.take(4); + tokio::pin!(rd); + + let mut read_buf = ReadBuf::new(&mut buf); + read_buf.put_slice(b"AB"); + + futures::future::poll_fn(|cx| rd.as_mut().poll_read(cx, &mut read_buf)).await.unwrap(); + assert_eq!(&buf, &b"ABhell\0\0"[..]); +} + struct BadReader; impl AsyncRead for BadReader { From fa2cf8a697fbe19961a74b95973b7f8db5169dc1 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Fri, 28 Jan 2022 19:39:02 +0100 Subject: [PATCH 2/2] rustfmt --- tokio/tests/io_take.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tokio/tests/io_take.rs b/tokio/tests/io_take.rs index 28342b4651e..684e041a674 100644 --- a/tokio/tests/io_take.rs +++ b/tokio/tests/io_take.rs @@ -28,7 +28,9 @@ async fn issue_4435() { let mut read_buf = ReadBuf::new(&mut buf); read_buf.put_slice(b"AB"); - futures::future::poll_fn(|cx| rd.as_mut().poll_read(cx, &mut read_buf)).await.unwrap(); + futures::future::poll_fn(|cx| rd.as_mut().poll_read(cx, &mut read_buf)) + .await + .unwrap(); assert_eq!(&buf, &b"ABhell\0\0"[..]); }