From 942238237e14d4eec4d0e779c8c46520d66a331d Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Mon, 19 Feb 2018 11:53:29 -0800 Subject: [PATCH] Move ReadyService to a dedicated crate. (#48) This is the first step to resolve #44. The move will happen in two steps to avoid breaking any libs depending on this now. --- Cargo.toml | 1 + tower-ready-service/Cargo.toml | 9 +++++++++ tower-ready-service/README.md | 0 tower-ready-service/src/lib.rs | 3 +++ tower-util/Cargo.toml | 1 + tower-util/src/lib.rs | 1 + tower-util/src/service_fn.rs | 3 ++- 7 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 tower-ready-service/Cargo.toml create mode 100644 tower-ready-service/README.md create mode 100644 tower-ready-service/src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index 377aedf..a160250 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,7 @@ members = [ "tower-filter", "tower-mock", "tower-rate-limit", + "tower-ready-service", "tower-reconnect", "tower-router", "tower-timeout", diff --git a/tower-ready-service/Cargo.toml b/tower-ready-service/Cargo.toml new file mode 100644 index 0000000..0752911 --- /dev/null +++ b/tower-ready-service/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "tower-ready-service" +version = "0.1.0" +authors = ["Carl Lerche "] +publish = false + +[dependencies] +futures = "0.1" +tower = { version = "0.1", path = "../" } diff --git a/tower-ready-service/README.md b/tower-ready-service/README.md new file mode 100644 index 0000000..e69de29 diff --git a/tower-ready-service/src/lib.rs b/tower-ready-service/src/lib.rs new file mode 100644 index 0000000..7df5dc4 --- /dev/null +++ b/tower-ready-service/src/lib.rs @@ -0,0 +1,3 @@ +extern crate tower; + +pub use tower::ReadyService; diff --git a/tower-util/Cargo.toml b/tower-util/Cargo.toml index 801a3ed..ab2fd3a 100644 --- a/tower-util/Cargo.toml +++ b/tower-util/Cargo.toml @@ -7,3 +7,4 @@ publish = false [dependencies] futures = "0.1" tower = { version = "0.1", path = ".." } +tower-ready-service = { version = "0.1", path = "../tower-ready-service" } diff --git a/tower-util/src/lib.rs b/tower-util/src/lib.rs index 8b38ee2..95220d1 100644 --- a/tower-util/src/lib.rs +++ b/tower-util/src/lib.rs @@ -2,6 +2,7 @@ extern crate futures; extern crate tower; +extern crate tower_ready_service; pub mod either; pub mod option; diff --git a/tower-util/src/service_fn.rs b/tower-util/src/service_fn.rs index 94b0875..d0d3643 100644 --- a/tower-util/src/service_fn.rs +++ b/tower-util/src/service_fn.rs @@ -1,5 +1,6 @@ use futures::IntoFuture; -use tower::{Service, ReadyService, NewService}; +use tower::{Service, NewService}; +use tower_ready_service::ReadyService; use std::marker::PhantomData;