1 files changed, 5 insertions, 8 deletions
diff --git a/tokio/src/io/util/read_buf.rs b/tokio/src/io/util/read_buf.rs
index 550499b9..97e670de 100644
--- a/tokio/src/io/util/read_buf.rs
+++ b/tokio/src/io/util/read_buf.rs
@@ -8,7 +8,7 @@ use std::task::{Context, Poll};
 
 pub(crate) fn read_buf<'a, R, B>(reader: &'a mut R, buf: &'a mut B) -> ReadBuf<'a, R, B>
 where
-    R: AsyncRead,
+    R: AsyncRead + Unpin,
     B: BufMut,
 {
     ReadBuf { reader, buf }
@@ -26,16 +26,13 @@ cfg_io_util! {
 
 impl<R, B> Future for ReadBuf<'_, R, B>
 where
-    R: AsyncRead,
+    R: AsyncRead + Unpin,
     B: BufMut,
 {
     type Output = io::Result<usize>;
 
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
-        // safety: no data is moved from self
-        unsafe {
-            let me = self.get_unchecked_mut();
-            Pin::new_unchecked(&mut *me.reader).poll_read_buf(cx, &mut me.buf)
-        }
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
+        let me = &mut *self;
+        Pin::new(&mut *me.reader).poll_read_buf(cx, me.buf)
     }
 }