diff --git a/tower-util/Cargo.toml b/tower-util/Cargo.toml index 81e0fc1..c131600 100644 --- a/tower-util/Cargo.toml +++ b/tower-util/Cargo.toml @@ -23,6 +23,7 @@ categories = ["asynchronous", "network-programming"] edition = "2018" [features] +default = ["call-all"] call-all = ["futures-util"] [dependencies] @@ -37,5 +38,4 @@ futures-util = { version = "0.3", optional = true, default-features = false, fea [dev-dependencies] tokio-test = "0.2" tokio = { version = "0.2", features = ["stream", "sync", "macros"] } -tower = { version = "0.3", path = "../tower" } tower-test = { version = "0.3", path = "../tower-test" } diff --git a/tower-util/src/call_all/ordered.rs b/tower-util/src/call_all/ordered.rs index c9f6264..b3374eb 100644 --- a/tower-util/src/call_all/ordered.rs +++ b/tower-util/src/call_all/ordered.rs @@ -23,7 +23,7 @@ use tower_service::Service; /// use futures_util::future::{ready, Ready}; /// use futures_util::StreamExt; /// use tower_service::Service; -/// use tower::ServiceExt; +/// use tower_util::ServiceExt; /// use tokio::prelude::*; /// /// // First, we need to have a Service to process our requests. diff --git a/tower-util/src/lib.rs b/tower-util/src/lib.rs index ecb96b1..47b7c4f 100644 --- a/tower-util/src/lib.rs +++ b/tower-util/src/lib.rs @@ -30,7 +30,8 @@ pub use crate::{ #[cfg(feature = "call-all")] pub use crate::call_all::{CallAll, CallAllUnordered}; -type Error = Box; +#[doc(hidden)] +pub type Error = Box; pub mod error { //! Error types diff --git a/tower-util/tests/call_all.rs b/tower-util/tests/call_all.rs index c1652ec..0b056d2 100644 --- a/tower-util/tests/call_all.rs +++ b/tower-util/tests/call_all.rs @@ -6,9 +6,9 @@ use futures_util::{ use std::task::{Context, Poll}; use std::{cell::Cell, rc::Rc}; use tokio_test::{assert_pending, assert_ready, task}; -use tower::ServiceExt; use tower_service::*; use tower_test::{assert_request_eq, mock}; +use tower_util::ServiceExt; type Error = Box;