Revamp IO traits and Stream trait

Author: Stjepan Glavina

Cargo.toml

@@ -26,6 +26,7 @@ futures-preview = "0.3.0-alpha.17"
 futures-timer = "0.3.0"
 lazy_static = "1.3.0"
 log = { version = "0.4.8", features = ["kv_unstable"] }
+memchr = "2.2.1"
 mio = "0.6.19"
 mio-uds = "0.6.7"
 num_cpus = "1.10.0"

src/fs/file.rs

@@ -483,7 +483,7 @@ impl File {
     }
 }
 
-impl AsyncRead for File {
+impl futures::io::AsyncRead for File {
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
@@ -498,7 +498,7 @@ impl AsyncRead for File {
     }
 }
 
-impl AsyncRead for &File {
+impl futures::io::AsyncRead for &File {
     fn poll_read(
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
@@ -564,7 +564,7 @@ impl AsyncRead for &File {
     }
 }
 
-impl AsyncWrite for File {
+impl futures::io::AsyncWrite for File {
     fn poll_write(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
@@ -582,7 +582,7 @@ impl AsyncWrite for File {
     }
 }
 
-impl AsyncWrite for &File {
+impl futures::io::AsyncWrite for &File {
     fn poll_write(
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
@@ -693,7 +693,7 @@ impl AsyncWrite for &File {
     }
 }
 
-impl AsyncSeek for File {
+impl futures::io::AsyncSeek for File {
     fn poll_seek(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,

src/future/mod.rs

@@ -3,44 +3,8 @@
 #[doc(inline)]
 pub use std::future::Future;
 
-/// Never resolves to a value.
-///
-/// # Examples
-/// ```
-/// # #![feature(async_await)]
-/// # fn main() { async_std::task::block_on(async {
-/// #
-/// use async_std::future::pending;
-/// use async_std::prelude::*;
-/// use std::time::Duration;
-///
-/// let dur = Duration::from_secs(1);
-/// assert!(pending::<()>().timeout(dur).await.is_err());
-/// #
-/// # }) }
-/// ```
-pub async fn pending<T>() -> T {
-    futures::future::pending::<T>().await
-}
+pub use pending::pending;
+pub use ready::ready;
 
-/// Resolves to the provided value.
-///
-/// This function is an async version of [`std::convert::identity`].
-///
-/// [`std::convert::identity`]: https://doc.rust-lang.org/std/convert/fn.identity.html
-///
-/// # Examples
-///
-/// ```
-/// # #![feature(async_await)]
-/// # fn main() { async_std::task::block_on(async {
-/// #
-/// use async_std::future::ready;
-///
-/// assert_eq!(ready(10).await, 10);
-/// #
-/// # }) }
-/// ```
-pub async fn ready<T>(val: T) -> T {
-    val
-}
+mod pending;
+mod ready;

src/future/pending.rs

@@ -0,0 +1,19 @@
+/// Never resolves to a value.
+///
+/// # Examples
+/// ```
+/// # #![feature(async_await)]
+/// # fn main() { async_std::task::block_on(async {
+/// #
+/// use async_std::future::pending;
+/// use async_std::prelude::*;
+/// use std::time::Duration;
+///
+/// let dur = Duration::from_secs(1);
+/// assert!(pending::<()>().timeout(dur).await.is_err());
+/// #
+/// # }) }
+/// ```
+pub async fn pending<T>() -> T {
+    futures::future::pending::<T>().await
+}

src/future/ready.rs

@@ -0,0 +1,21 @@
+/// Resolves to the provided value.
+///
+/// This function is an async version of [`std::convert::identity`].
+///
+/// [`std::convert::identity`]: https://doc.rust-lang.org/std/convert/fn.identity.html
+///
+/// # Examples
+///
+/// ```
+/// # #![feature(async_await)]
+/// # fn main() { async_std::task::block_on(async {
+/// #
+/// use async_std::future::ready;
+///
+/// assert_eq!(ready(10).await, 10);
+/// #
+/// # }) }
+/// ```
+pub async fn ready<T>(val: T) -> T {
+    val
+}