Add iovec feature

taiki-e · taiki-e · commit e5761735cf47 · 2019-04-16T03:30:59.000+09:00
diff --git a/futures-io/Cargo.toml b/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.14", default-features = false }
diff --git a/futures-io/src/lib.rs b/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.14/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
         /// `Poll::Pending` and either internally retry or convert
         /// `Interrupted` into another error kind.
+        #[cfg(feature = "iovec")]
         fn poll_vectored_read(self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &mut [IoVecMut<'_>])
             -> Poll<Result<usize>>
         {
@@ -196,6 +201,7 @@ mod if_std {
         /// `Interrupted`.  Implementations must convert `WouldBlock` into
         /// `Poll::Pending` and either internally retry or convert
         /// `Interrupted` into another error kind.
+        #[cfg(feature = "iovec")]
         fn poll_vectored_write(self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &[IoVec<'_>])
             -> Poll<Result<usize>>
         {
@@ -255,6 +261,7 @@ mod if_std {
                 Pin::new(&mut **self).poll_read(cx, buf)
             }
 
+            #[cfg(feature = "iovec")]
             fn poll_vectored_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &mut [IoVecMut<'_>])
                 -> Poll<Result<usize>>
             {
@@ -282,6 +289,7 @@ mod if_std {
             T::poll_read((*self).as_mut(), cx, buf)
         }
 
+        #[cfg(feature = "iovec")]
         fn poll_vectored_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &mut [IoVecMut<'_>])
             -> Poll<Result<usize>>
         {
@@ -302,6 +310,13 @@ mod if_std {
             {
                 Poll::Ready(StdIo::Read::read(&mut *self, buf))
             }
+
+            #[cfg(feature = "iovec")]
+            fn poll_vectored_read(mut self: Pin<&mut Self>, _: &mut Context<'_>, vec: &mut [IoVecMut<'_>])
+                -> Poll<Result<usize>>
+            {
+                Poll::Ready(StdIo::Read::read_vectored(&mut *self, vec))
+            }
         }
     }
 
@@ -325,6 +340,7 @@ mod if_std {
                 Pin::new(&mut **self).poll_write(cx, buf)
             }
 
+            #[cfg(feature = "iovec")]
             fn poll_vectored_write(mut self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &[IoVec<'_>])
                 -> Poll<Result<usize>>
             {
@@ -356,6 +372,7 @@ mod if_std {
             T::poll_write((*self).as_mut(), cx, buf)
         }
 
+        #[cfg(feature = "iovec")]
         fn poll_vectored_write(mut self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &[IoVec<'_>])
             -> Poll<Result<usize>>
         {
@@ -379,6 +396,13 @@ mod if_std {
                 Poll::Ready(StdIo::Write::write(&mut *self, buf))
             }
 
+            #[cfg(feature = "iovec")]
+            fn poll_vectored_write(mut self: Pin<&mut Self>, _: &mut Context<'_>, vec: &[IoVec<'_>])
+                -> Poll<Result<usize>>
+            {
+                Poll::Ready(StdIo::Write::write_vectored(&mut *self, vec))
+            }
+
             fn poll_flush(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<()>> {
                 Poll::Ready(StdIo::Write::flush(&mut *self))
             }
@@ -407,6 +431,13 @@ mod if_std {
             Poll::Ready(result)
         }
 
+        #[cfg(feature = "iovec")]
+        fn poll_vectored_write(self: Pin<&mut Self>, _: &mut Context<'_>, 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>, _: &mut Context<'_>) -> Poll<Result<()>> {
             Poll::Ready(StdIo::Write::flush(&mut self.get_mut().get_mut().as_mut()))
         }
diff --git a/futures-util/Cargo.toml b/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 = ["futures-core-preview/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.14", default-features = false }
diff --git a/futures-util/src/io/mod.rs b/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;
 
diff --git a/futures-util/src/io/split.rs b/futures-util/src/io/split.rs
@@ -1,6 +1,8 @@
 use crate::lock::BiLock;
 use futures_core::task::{Context, 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, cx, |l, cx| l.poll_read(cx, buf))
     }
 
+    #[cfg(feature = "iovec")]
     fn poll_vectored_read(self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &mut [IoVecMut<'_>])
         -> Poll<io::Result<usize>>
     {
@@ -57,6 +60,7 @@ impl<W: AsyncWrite> AsyncWrite for WriteHalf<W> {
         lock_and_then(&self.handle, cx, |l, cx| l.poll_write(cx, buf))
     }
 
+    #[cfg(feature = "iovec")]
     fn poll_vectored_write(self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &[IoVec<'_>])
         -> Poll<io::Result<usize>>
     {
diff --git a/futures-util/src/lib.rs b/futures-util/src/lib.rs
@@ -3,8 +3,9 @@
 
 #![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(feature = "iovec", feature(iovec))]
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
@@ -14,6 +15,9 @@
 #[cfg(all(feature = "cfg-target-has-atomic", not(feature = "nightly")))]
 compile_error!("The `cfg-target-has-atomic` feature requires the `nightly` feature as an explicit 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(feature = "alloc")]
 extern crate alloc;
 
diff --git a/futures/Cargo.toml b/futures/Cargo.toml
@@ -36,10 +36,11 @@ futures-test-preview = { path = "../futures-test", version = "=0.3.0-alpha.14" }
 tokio = "0.1.11"
 
 [features]
-nightly = ["futures-core-preview/nightly", "futures-sink-preview/nightly", "futures-util-preview/nightly"]
+nightly = ["futures-core-preview/nightly", "futures-io-preview/nightly", "futures-sink-preview/nightly", "futures-util-preview/nightly"]
 std = ["alloc", "futures-core-preview/std", "futures-executor-preview/std", "futures-io-preview/std", "futures-sink-preview/std", "futures-util-preview/std"]
 default = ["std"]
 compat = ["std", "futures-util-preview/compat"]
 io-compat = ["compat", "futures-util-preview/io-compat"]
 cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic", "futures-util-preview/cfg-target-has-atomic"]
 alloc = ["futures-core-preview/alloc", "futures-sink-preview/alloc", "futures-util-preview/alloc"]
+iovec = ["futures-io-preview/iovec", "futures-util-preview/iovec"]
diff --git a/futures/src/lib.rs b/futures/src/lib.rs
@@ -22,8 +22,8 @@
 //! 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(feature = "iovec", feature(iovec))]
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -34,6 +34,9 @@
 #[cfg(all(feature = "cfg-target-has-atomic", not(feature = "nightly")))]
 compile_error!("The `cfg-target-has-atomic` feature requires the `nightly` feature as an explicit 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;
@@ -256,8 +259,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,

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,10 @@`
`11`	`11`	`#![doc(html_root_url = "https://rust-lang-nursery.github.io/futures-api-docs/0.3.0-alpha.14/futures_io")]`
`12`	`12`
`13`	`13`	`#![feature(futures_api)]`
`14`		`-#![cfg_attr(feature = "std", feature(iovec))]`
	`14`	`+#![cfg_attr(feature = "iovec", feature(iovec))]`
	`15`	`+`
	`16`	`+#[cfg(all(feature = "iovec", not(feature = "nightly")))]`
	`17`	+compile_error!("The `iovec` feature requires the `nightly` feature as an explicit opt-in to unstable features");
`15`	`18`
`16`	`19`	`#[cfg(feature = "std")]`
`17`	`20`	`mod if_std {`
`@@ -23,6 +26,7 @@ mod if_std {`
`23`	`26`	`use std::ptr;`
`24`	`27`
`25`	`28`	`// Re-export IoVec and IoVecMut for convenience`
	`29`	`+ #[cfg(feature = "iovec")]`
`26`	`30`	`pub use self::StdIo::{IoVec, IoVecMut};`
`27`	`31`
`28`	`32`	`// Re-export io::Error so that users don't have to deal`
`@@ -135,6 +139,7 @@ mod if_std {`
`135`	`139`	/// `Interrupted`. Implementations must convert `WouldBlock` into
`136`	`140`	/// `Poll::Pending` and either internally retry or convert
`137`	`141`	/// `Interrupted` into another error kind.
	`142`	`+ #[cfg(feature = "iovec")]`
`138`	`143`	`fn poll_vectored_read(self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &mut [IoVecMut<'_>])`
`139`	`144`	`-> Poll<Result<usize>>`
`140`	`145`	`{`
`@@ -196,6 +201,7 @@ mod if_std {`
`196`	`201`	/// `Interrupted`. Implementations must convert `WouldBlock` into
`197`	`202`	/// `Poll::Pending` and either internally retry or convert
`198`	`203`	/// `Interrupted` into another error kind.
	`204`	`+ #[cfg(feature = "iovec")]`
`199`	`205`	`fn poll_vectored_write(self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &[IoVec<'_>])`
`200`	`206`	`-> Poll<Result<usize>>`
`201`	`207`	`{`
`@@ -255,6 +261,7 @@ mod if_std {`
`255`	`261`	`Pin::new(&mut **self).poll_read(cx, buf)`
`256`	`262`	`}`
`257`	`263`
	`264`	`+ #[cfg(feature = "iovec")]`
`258`	`265`	`fn poll_vectored_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &mut [IoVecMut<'_>])`
`259`	`266`	`-> Poll<Result<usize>>`
`260`	`267`	`{`
`@@ -282,6 +289,7 @@ mod if_std {`
`282`	`289`	`T::poll_read((*self).as_mut(), cx, buf)`
`283`	`290`	`}`
`284`	`291`
	`292`	`+ #[cfg(feature = "iovec")]`
`285`	`293`	`fn poll_vectored_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &mut [IoVecMut<'_>])`
`286`	`294`	`-> Poll<Result<usize>>`
`287`	`295`	`{`
`@@ -302,6 +310,13 @@ mod if_std {`
`302`	`310`	`{`
`303`	`311`	`Poll::Ready(StdIo::Read::read(&mut *self, buf))`
`304`	`312`	`}`
	`313`	`+`
	`314`	`+ #[cfg(feature = "iovec")]`
	`315`	`+ fn poll_vectored_read(mut self: Pin<&mut Self>, _: &mut Context<'_>, vec: &mut [IoVecMut<'_>])`
	`316`	`+ -> Poll<Result<usize>>`
	`317`	`+ {`
	`318`	`+ Poll::Ready(StdIo::Read::read_vectored(&mut *self, vec))`
	`319`	`+ }`
`305`	`320`	`}`
`306`	`321`	`}`
`307`	`322`
`@@ -325,6 +340,7 @@ mod if_std {`
`325`	`340`	`Pin::new(&mut **self).poll_write(cx, buf)`
`326`	`341`	`}`
`327`	`342`
	`343`	`+ #[cfg(feature = "iovec")]`
`328`	`344`	`fn poll_vectored_write(mut self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &[IoVec<'_>])`
`329`	`345`	`-> Poll<Result<usize>>`
`330`	`346`	`{`
`@@ -356,6 +372,7 @@ mod if_std {`
`356`	`372`	`T::poll_write((*self).as_mut(), cx, buf)`
`357`	`373`	`}`
`358`	`374`
	`375`	`+ #[cfg(feature = "iovec")]`
`359`	`376`	`fn poll_vectored_write(mut self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &[IoVec<'_>])`
`360`	`377`	`-> Poll<Result<usize>>`
`361`	`378`	`{`
`@@ -379,6 +396,13 @@ mod if_std {`
`379`	`396`	`Poll::Ready(StdIo::Write::write(&mut *self, buf))`
`380`	`397`	`}`
`381`	`398`
	`399`	`+ #[cfg(feature = "iovec")]`
	`400`	`+ fn poll_vectored_write(mut self: Pin<&mut Self>, _: &mut Context<'_>, vec: &[IoVec<'_>])`
	`401`	`+ -> Poll<Result<usize>>`
	`402`	`+ {`
	`403`	`+ Poll::Ready(StdIo::Write::write_vectored(&mut *self, vec))`
	`404`	`+ }`
	`405`	`+`
`382`	`406`	`fn poll_flush(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<()>> {`
`383`	`407`	`Poll::Ready(StdIo::Write::flush(&mut *self))`
`384`	`408`	`}`
`@@ -407,6 +431,13 @@ mod if_std {`
`407`	`431`	`Poll::Ready(result)`
`408`	`432`	`}`
`409`	`433`
	`434`	`+ #[cfg(feature = "iovec")]`
	`435`	`+ fn poll_vectored_write(self: Pin<&mut Self>, _: &mut Context<'_>, vec: &[IoVec<'_>])`
	`436`	`+ -> Poll<Result<usize>>`
	`437`	`+ {`
	`438`	`+ Poll::Ready(StdIo::Write::write_vectored(&mut self.get_mut().get_mut().as_mut(), vec))`
	`439`	`+ }`
	`440`	`+`
`410`	`441`	`fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<()>> {`
`411`	`442`	`Poll::Ready(StdIo::Write::flush(&mut self.get_mut().get_mut().as_mut()))`
`412`	`443`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`use crate::lock::BiLock;`
`2`	`2`	`use futures_core::task::{Context, Poll};`
`3`		`-use futures_io::{AsyncRead, AsyncWrite, IoVec, IoVecMut};`
	`3`	`+use futures_io::{AsyncRead, AsyncWrite};`
	`4`	`+#[cfg(feature = "iovec")]`
	`5`	`+use futures_io::{IoVec, IoVecMut};`
`4`	`6`	`use std::io;`
`5`	`7`	`use std::pin::Pin;`
`6`	`8`
`@@ -43,6 +45,7 @@ impl<R: AsyncRead> AsyncRead for ReadHalf<R> {`
`43`	`45`	`lock_and_then(&self.handle, cx, \|l, cx\| l.poll_read(cx, buf))`
`44`	`46`	`}`
`45`	`47`
	`48`	`+ #[cfg(feature = "iovec")]`
`46`	`49`	`fn poll_vectored_read(self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &mut [IoVecMut<'_>])`
`47`	`50`	`-> Poll<io::Result<usize>>`
`48`	`51`	`{`
`@@ -57,6 +60,7 @@ impl<W: AsyncWrite> AsyncWrite for WriteHalf<W> {`
`57`	`60`	`lock_and_then(&self.handle, cx, \|l, cx\| l.poll_write(cx, buf))`
`58`	`61`	`}`
`59`	`62`
	`63`	`+ #[cfg(feature = "iovec")]`
`60`	`64`	`fn poll_vectored_write(self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &[IoVec<'_>])`
`61`	`65`	`-> Poll<io::Result<usize>>`
`62`	`66`	`{`