Reduced number of dependencies pulled from futures

capnp-futures/Cargo.toml

@@ -13,16 +13,22 @@ keywords = ["async"]
 
 [dependencies]
 capnp = { version = "0.13.0", path = "../capnp" }
+futures-core = { version = "0.3.0", default-features = false }
 
-[dependencies.futures]
+[dependencies.futures-io]
 version = "0.3.0"
 default-features = false
-features = ["std", "executor"]
+features = ["std"]
 
-[dev-dependencies.futures]
+[dependencies.futures-util]
 version = "0.3.0"
 default-features = false
-features = ["executor"]
+features = ["io"]
+
+[dependencies.futures-channel]
+version = "0.3.0"
+default-features = false
+features = ["std"]
 
 [dev-dependencies]
 capnp = { version = "0.13.0", path = "../capnp", features = ["quickcheck"] }

capnp-futures/src/lib.rs

@@ -18,11 +18,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-extern crate futures;
+extern crate futures_channel;
+extern crate futures_core;
+extern crate futures_io;
+extern crate futures_util;
 
 pub use read_stream::ReadStream;
 pub use write_queue::{write_queue, Sender};
 
-pub mod serialize;
 mod read_stream;
+pub mod serialize;
 mod write_queue;

capnp-futures/src/read_stream.rs

@@ -18,41 +18,61 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+use futures_core::future::Future;
+use futures_io::AsyncRead;
+use futures_util::stream::Stream;
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use futures::future::Future;
-use futures::stream::Stream;
-use futures::{AsyncRead};
 
-use capnp::{Error, message};
+use capnp::{message, Error};
 
-async fn read_next_message<R>(mut reader: R, options: message::ReaderOptions)
-                              -> Result<(R, Option<message::Reader<capnp::serialize::OwnedSegments>>), Error>
-    where R: AsyncRead + Unpin
+async fn read_next_message<R>(
+    mut reader: R,
+    options: message::ReaderOptions,
+) -> Result<(R, Option<message::Reader<capnp::serialize::OwnedSegments>>), Error>
+where
+    R: AsyncRead + Unpin,
 {
     let m = crate::serialize::read_message(&mut reader, options).await?;
     Ok((reader, m))
 }
 
 #[must_use = "streams do nothing unless polled"]
-pub struct ReadStream<'a, R> where R: AsyncRead + Unpin  {
+pub struct ReadStream<'a, R>
+where
+    R: AsyncRead + Unpin,
+{
     options: message::ReaderOptions,
-    read: Pin<Box<dyn Future<Output=Result<(R, Option<message::Reader<capnp::serialize::OwnedSegments>>), Error>> + 'a >>,
+    read: Pin<
+        Box<
+            dyn Future<
+                    Output = Result<
+                        (R, Option<message::Reader<capnp::serialize::OwnedSegments>>),
+                        Error,
+                    >,
+                > + 'a,
+        >,
+    >,
 }
 
-impl <'a, R> Unpin for ReadStream<'a, R> where R: AsyncRead + Unpin  {}
+impl<'a, R> Unpin for ReadStream<'a, R> where R: AsyncRead + Unpin {}
 
-impl <'a, R> ReadStream<'a, R> where R: AsyncRead + Unpin + 'a  {
-    pub fn new(reader: R, options: message::ReaderOptions) -> Self
-    {
+impl<'a, R> ReadStream<'a, R>
+where
+    R: AsyncRead + Unpin + 'a,
+{
+    pub fn new(reader: R, options: message::ReaderOptions) -> Self {
         ReadStream {
             read: Box::pin(read_next_message(reader, options)),
             options: options,
         }
     }
 }
 
-impl <'a, R> Stream for ReadStream<'a, R> where R: AsyncRead + Unpin + 'a  {
+impl<'a, R> Stream for ReadStream<'a, R>
+where
+    R: AsyncRead + Unpin + 'a,
+{
     type Item = Result<message::Reader<capnp::serialize::OwnedSegments>, Error>;
 
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {