Reduce futures dependency to component crates

Cargo.toml

@@ -8,7 +8,9 @@ braid = { path = "./braid" }
 
 bytes = "1"
 camino = { version = "1" }
-futures = "^0.3"
+futures = "0.3"
+futures-core = "0.3"
+futures-util = "0.3"
 http = { version = "1" }
 http-body = { version = "1" }
 http-body-util = { version = "0.1" }

braid/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 camino.workspace = true
-futures.workspace = true
+futures-core.workspace = true
 http.workspace = true
 hyper = { workspace = true, features = ["full"] }
 pin-project.workspace = true
@@ -19,6 +19,7 @@ tower.workspace = true
 tracing.workspace = true
 
 [dev-dependencies]
+futures-util.workspace = true
 pem-rfc7468 = { version = "0.7", features = ["alloc"] }
-tokio = { version = "1", features = ["macros"] }
 tempfile = "3"
+tokio = { version = "1", features = ["macros"] }

braid/src/duplex.rs

@@ -169,7 +169,7 @@ impl Accept for DuplexIncoming {
     }
 }
 
-impl futures::Stream for DuplexIncoming {
+impl futures_core::Stream for DuplexIncoming {
     type Item = Result<DuplexStream, io::Error>;
 
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {

braid/src/server/acceptor.rs

@@ -82,7 +82,7 @@ impl Accept for Acceptor {
     }
 }
 
-impl futures::Stream for Acceptor {
+impl futures_core::Stream for Acceptor {
     type Item = Result<Stream, io::Error>;
 
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {

braid/src/server/connector.rs

@@ -9,7 +9,7 @@ use std::{
     task::Poll,
 };
 
-use futures::future::BoxFuture;
+use futures_core::future::BoxFuture;
 use hyper::{Request, Response};
 use tower::{Layer, Service};
 use tracing::{dispatcher, Instrument};

braid/src/tls/client/mod.rs

@@ -6,8 +6,8 @@ use std::sync::Arc;
 use std::{fmt, io};
 use std::{future::Future, pin::Pin};
 
-use futures::future::BoxFuture;
-use futures::ready;
+use futures_core::future::BoxFuture;
+use futures_core::ready;
 use hyper::client::connect::Connection;
 use hyper::client::HttpConnector;
 use hyper::Uri;

braid/src/tls/server/acceptor.rs

@@ -4,7 +4,7 @@ use core::task::{Context, Poll};
 use std::pin::Pin;
 use std::{io, sync::Arc};
 
-use futures::ready;
+use futures_core::ready;
 use hyper::server::accept::Accept;
 use hyper::server::conn::AddrIncoming;
 use pin_project::pin_project;

braid/src/tls/server/connector.rs

@@ -9,7 +9,7 @@ use std::{
     task::Poll,
 };
 
-use futures::future::BoxFuture;
+use futures_core::future::BoxFuture;
 use hyper::{Request, Response};
 use tower::{Layer, Service};
 use tracing::{dispatcher, Instrument};

braid/src/tls/server/mod.rs

@@ -7,7 +7,7 @@ use std::task::{Context, Poll};
 use std::{fmt, io};
 use std::{future::Future, pin::Pin};
 
-use futures::ready;
+use futures_core::ready;
 use hyper::server::conn::AddrStream;
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use tokio_rustls::Accept;

braid/tests/duplex.rs

@@ -1,6 +1,6 @@
 #[tokio::test]
 async fn braided_duplex() {
-    use futures::StreamExt;
+    use futures_util::StreamExt;
     use tokio::io::{AsyncReadExt, AsyncWriteExt};
 
     let (client, incoming) = braid::duplex::DuplexClient::new("test".parse().unwrap());

braid/tests/tcp.rs

@@ -2,7 +2,7 @@ use std::net::Ipv4Addr;
 
 #[tokio::test]
 async fn braided_tcp() {
-    use futures::StreamExt;
+    use futures_util::StreamExt;
     use tokio::io::{AsyncReadExt, AsyncWriteExt};
 
     let incoming =

braid/tests/tls.rs

@@ -25,7 +25,7 @@ fn tls_root_store() -> rustls::RootCertStore {
 
 #[tokio::test]
 async fn braided_tls() {
-    use futures::StreamExt;
+    use futures_util::StreamExt;
     use tokio::io::{AsyncReadExt, AsyncWriteExt};
 
     let incoming =

braid/tests/unix.rs

@@ -1,6 +1,6 @@
 #[tokio::test]
 async fn braided_unix() {
-    use futures::StreamExt;
+    use futures_util::StreamExt;
     use tokio::io::{AsyncReadExt, AsyncWriteExt};
 
     let dir = tempfile::tempdir().unwrap();