fix 2

tokio-rs · May 12, 2020 · 7a98b67 · 7a98b67
1 parent 7b656d3
commit 7a98b67
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/tokio/src/io/async_read.rs b/tokio/src/io/async_read.rs
@@ -96,13 +96,13 @@ pub trait AsyncRead {
     ///
     /// [`io::Read`]: std::io::Read
     /// [`poll_read_buf`]: #method.poll_read_buf
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool; /* {
-                                                                                            for x in buf {
-                                                                                                *x.as_mut_ptr() = 0;
-                                                                                            }
+    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
+        for x in buf {
+            *x.as_mut_ptr() = 0;
+        }
 
-                                                                                            true
-                                                                                        }*/
+        true
+    }
 
     /// Attempts to read from the `AsyncRead` into `buf`.
     ///

diff --git a/tokio/src/io/split.rs b/tokio/src/io/split.rs
@@ -99,10 +99,6 @@ impl<T> WriteHalf<T> {
 }
 
 impl<T: AsyncRead> AsyncRead for ReadHalf<T> {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
-        panic!()
-    }
-
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,

diff --git a/tokio/src/io/stdin.rs b/tokio/src/io/stdin.rs
@@ -63,7 +63,7 @@ impl std::os::windows::io::AsRawHandle for Stdin {
 }
 
 impl AsyncRead for Stdin {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
+    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
         // https://github.com/rust-lang/rust/blob/09c817eeb29e764cfc12d0a8d94841e3ffe34023/src/libstd/io/stdio.rs#L97
         false
     }

diff --git a/tokio/src/io/util/empty.rs b/tokio/src/io/util/empty.rs
@@ -47,7 +47,7 @@ cfg_io_util! {
 }
 
 impl AsyncRead for Empty {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
+    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
         false
     }
     #[inline]

diff --git a/tokio/src/io/util/repeat.rs b/tokio/src/io/util/repeat.rs
@@ -47,7 +47,7 @@ cfg_io_util! {
 }
 
 impl AsyncRead for Repeat {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
+    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
         false
     }
     #[inline]

diff --git a/tokio/src/process/mod.rs b/tokio/src/process/mod.rs
@@ -872,7 +872,7 @@ impl AsyncWrite for ChildStdin {
 }
 
 impl AsyncRead for ChildStdout {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
+    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
         // https://github.com/rust-lang/rust/blob/09c817eeb29e764cfc12d0a8d94841e3ffe34023/src/libstd/process.rs#L314
         false
     }
@@ -887,7 +887,7 @@ impl AsyncRead for ChildStdout {
 }
 
 impl AsyncRead for ChildStderr {
-    unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
+    unsafe fn prepare_uninitialized_buffer(&self, _buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
         // https://github.com/rust-lang/rust/blob/09c817eeb29e764cfc12d0a8d94841e3ffe34023/src/libstd/process.rs#L375
         false
     }