Add iovec feature

Author: taiki-e

futures-io/Cargo.toml

@@ -17,6 +17,8 @@ name = "futures_io"
 [features]
 std = ["futures-core-preview/std"]
 default = ["std"]
+nightly = []
+iovec = []
 
 [dependencies]
 futures-core-preview = { path = "../futures-core", version = "=0.3.0-alpha.13", default-features = false }

futures-io/src/lib.rs

@@ -11,7 +11,10 @@
 #![doc(html_root_url = "https://rust-lang-nursery.github.io/futures-api-docs/0.3.0-alpha.13/futures_io")]
 
 #![feature(futures_api)]
-#![cfg_attr(feature = "std", feature(iovec))]
+#![cfg_attr(feature = "iovec", feature(iovec))]
+
+#[cfg(all(feature = "iovec", not(feature = "nightly")))]
+compile_error!("The `iovec` feature requires the `nightly` feature as an explicit opt-in to unstable features");
 
 #[cfg(feature = "std")]
 mod if_std {
@@ -23,6 +26,7 @@ mod if_std {
     use std::ptr;
 
     // Re-export IoVec and IoVecMut for convenience
+    #[cfg(feature = "iovec")]
     pub use self::StdIo::{IoVec, IoVecMut};
 
     // Re-export io::Error so that users don't have to deal
@@ -135,6 +139,7 @@ mod if_std {
         /// `Interrupted`.  Implementations must convert `WouldBlock` into
         /// `Async::Pending` and either internally retry or convert
         /// `Interrupted` into another error kind.
+        #[cfg(feature = "iovec")]
         fn poll_vectored_read(self: Pin<&mut Self>, waker: &Waker, vec: &mut [IoVecMut<'_>])
             -> Poll<Result<usize>>
         {
@@ -196,6 +201,7 @@ mod if_std {
         /// `Interrupted`.  Implementations must convert `WouldBlock` into
         /// `Async::Pending` and either internally retry or convert
         /// `Interrupted` into another error kind.
+        #[cfg(feature = "iovec")]
         fn poll_vectored_write(self: Pin<&mut Self>, waker: &Waker, vec: &[IoVec<'_>])
             -> Poll<Result<usize>>
         {
@@ -255,6 +261,7 @@ mod if_std {
                 Pin::new(&mut **self).poll_read(waker, buf)
             }
 
+            #[cfg(feature = "iovec")]
             fn poll_vectored_read(mut self: Pin<&mut Self>, waker: &Waker, vec: &mut [IoVecMut<'_>])
                 -> Poll<Result<usize>>
             {
@@ -284,6 +291,13 @@ mod if_std {
             {
                 Poll::Ready(StdIo::Read::read(&mut *self, buf))
             }
+
+            #[cfg(feature = "iovec")]
+            fn poll_vectored_read(mut self: Pin<&mut Self>, _: &Waker, vec: &mut [IoVecMut<'_>])
+                -> Poll<Result<usize>>
+            {
+                Poll::Ready(StdIo::Read::read_vectored(&mut *self, vec))
+            }
         }
     }
 
@@ -307,6 +321,7 @@ mod if_std {
                 Pin::new(&mut **self).poll_write(waker, buf)
             }
 
+            #[cfg(feature = "iovec")]
             fn poll_vectored_write(mut self: Pin<&mut Self>, waker: &Waker, vec: &[IoVec<'_>])
                 -> Poll<Result<usize>>
             {
@@ -338,6 +353,7 @@ mod if_std {
             T::poll_write((*self).as_mut(), waker, buf)
         }
 
+        #[cfg(feature = "iovec")]
         fn poll_vectored_write(mut self: Pin<&mut Self>, waker: &Waker, vec: &[IoVec<'_>])
             -> Poll<Result<usize>>
         {
@@ -361,6 +377,13 @@ mod if_std {
                 Poll::Ready(StdIo::Write::write(&mut *self, buf))
             }
 
+            #[cfg(feature = "iovec")]
+            fn poll_vectored_write(mut self: Pin<&mut Self>, _: &Waker, vec: &[IoVec<'_>])
+                -> Poll<Result<usize>>
+            {
+                Poll::Ready(StdIo::Write::write_vectored(&mut *self, vec))
+            }
+
             fn poll_flush(mut self: Pin<&mut Self>, _: &Waker) -> Poll<Result<()>> {
                 Poll::Ready(StdIo::Write::flush(&mut *self))
             }
@@ -389,6 +412,13 @@ mod if_std {
             Poll::Ready(result)
         }
 
+        #[cfg(feature = "iovec")]
+        fn poll_vectored_write(self: Pin<&mut Self>, _: &Waker, vec: &[IoVec<'_>])
+            -> Poll<Result<usize>>
+        {
+            Poll::Ready(StdIo::Write::write_vectored(&mut self.get_mut().get_mut().as_mut(), vec))
+        }
+
         fn poll_flush(self: Pin<&mut Self>, _: &Waker) -> Poll<Result<()>> {
             Poll::Ready(StdIo::Write::flush(&mut self.get_mut().get_mut().as_mut()))
         }

futures-util/Cargo.toml

@@ -20,9 +20,10 @@ default = ["std", "futures-core-preview/either", "futures-sink-preview/either"]
 compat = ["std", "futures_01"]
 io-compat = ["compat", "tokio-io"]
 bench = []
-nightly = ["futures-core-preview/nightly", "futures-sink-preview/nightly"]
+nightly = ["futures-core-preview/nightly", "futures-io-preview/nightly", "futures-sink-preview/nightly"]
 cfg-target-has-atomic = []
 alloc = ["futures-core-preview/alloc", "futures-sink-preview/alloc"]
+iovec = ["futures-io-preview/iovec"]
 
 [dependencies]
 futures-core-preview = { path = "../futures-core", version = "=0.3.0-alpha.13", default-features = false }

futures-util/src/io/mod.rs

@@ -7,7 +7,10 @@
 
 use std::vec::Vec;
 
-pub use futures_io::{AsyncRead, AsyncWrite, IoVec, IoVecMut};
+pub use futures_io::{AsyncRead, AsyncWrite};
+
+#[cfg(feature = "iovec")]
+pub use futures_io::{IoVec, IoVecMut};
 
 #[cfg(feature = "io-compat")] use crate::compat::Compat;
 

futures-util/src/io/split.rs

@@ -1,6 +1,8 @@
 use crate::lock::BiLock;
 use futures_core::task::{Waker, Poll};
-use futures_io::{AsyncRead, AsyncWrite, IoVec, IoVecMut};
+use futures_io::{AsyncRead, AsyncWrite};
+#[cfg(feature = "iovec")]
+use futures_io::{IoVec, IoVecMut};
 use std::io;
 use std::pin::Pin;
 
@@ -43,6 +45,7 @@ impl<R: AsyncRead> AsyncRead for ReadHalf<R> {
         lock_and_then(&self.handle, waker, |l, waker| l.poll_read(waker, buf))
     }
 
+    #[cfg(feature = "iovec")]
     fn poll_vectored_read(self: Pin<&mut Self>, waker: &Waker, vec: &mut [IoVecMut<'_>])
         -> Poll<io::Result<usize>>
     {
@@ -57,6 +60,7 @@ impl<W: AsyncWrite> AsyncWrite for WriteHalf<W> {
         lock_and_then(&self.handle, waker, |l, waker| l.poll_write(waker, buf))
     }
 
+    #[cfg(feature = "iovec")]
     fn poll_vectored_write(self: Pin<&mut Self>, waker: &Waker, vec: &[IoVec<'_>])
         -> Poll<io::Result<usize>>
     {

futures-util/src/lib.rs

@@ -3,9 +3,10 @@
 
 #![feature(futures_api)]
 #![cfg_attr(feature = "alloc", feature(box_into_pin))]
-#![cfg_attr(feature = "std", feature(async_await, await_macro, iovec))]
+#![cfg_attr(feature = "std", feature(async_await, await_macro))]
 #![cfg_attr(feature = "cfg-target-has-atomic", feature(cfg_target_has_atomic))]
 #![cfg_attr(all(feature = "alloc", not(feature = "std")), feature(alloc, alloc_prelude))]
+#![cfg_attr(feature = "iovec", feature(iovec))]
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
@@ -18,6 +19,9 @@ compile_error!("The `cfg-target-has-atomic` feature requires the `nightly` featu
 #[cfg(all(feature = "alloc", not(any(feature = "std", feature = "nightly"))))]
 compile_error!("The `alloc` feature without `std` requires the `nightly` feature active to explicitly opt-in to unstable features");
 
+#[cfg(all(feature = "iovec", not(feature = "nightly")))]
+compile_error!("The `iovec` feature requires the `nightly` feature as an explicit opt-in to unstable features");
+
 #[cfg(all(feature = "alloc", not(feature = "std")))]
 extern crate alloc;
 #[cfg(feature = "std")]

futures/src/lib.rs

@@ -22,9 +22,9 @@
 //! completion, but *do not block* the thread running them.
 
 #![feature(futures_api)]
-#![cfg_attr(feature = "std", feature(iovec))]
 #![cfg_attr(feature = "cfg-target-has-atomic", feature(cfg_target_has_atomic))]
 #![cfg_attr(all(feature = "alloc", not(feature = "std")), feature(alloc))]
+#![cfg_attr(feature = "iovec", feature(iovec))]
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -38,6 +38,9 @@ compile_error!("The `cfg-target-has-atomic` feature requires the `nightly` featu
 #[cfg(all(feature = "alloc", not(any(feature = "std", feature = "nightly"))))]
 compile_error!("The `alloc` feature without `std` requires the `nightly` feature active to explicitly opt-in to unstable features");
 
+#[cfg(all(feature = "iovec", not(feature = "nightly")))]
+compile_error!("The `iovec` feature requires the `nightly` feature as an explicit opt-in to unstable features");
+
 #[doc(hidden)] pub use futures_util::core_reexport;
 
 #[doc(hidden)] pub use futures_core::future::Future;
@@ -257,8 +260,12 @@ pub mod io {
     //! sinks.
 
     pub use futures_io::{
-        Error, Initializer, IoVec, IoVecMut, ErrorKind, AsyncRead, AsyncWrite, Result
+        Error, Initializer, ErrorKind, AsyncRead, AsyncWrite, Result,
     };
+
+    #[cfg(feature = "iovec")]
+    pub use futures_io::{IoVec, IoVecMut};
+
     pub use futures_util::io::{
         AsyncReadExt, AsyncWriteExt, AllowStdIo, Close, CopyInto, Flush,
         Read, ReadExact, ReadHalf, ReadToEnd, Window, WriteAll, WriteHalf,