Rename tower-util -> tower (#197)

Cargo.toml

@@ -15,6 +15,5 @@ members = [
   "tower-service",
   "tower-service-util",
   "tower-timeout",
-  "tower-util",
   "tower-watch",
 ]

README.md

@@ -58,7 +58,7 @@ crates.
 * [`tower-timeout`]: Middleware that applies a timeout to requests
   ([docs][tt-docs]).
 
-* [`tower-util`]: Miscellaneous additional utilities for Tower
+* [`tower-service-util`]: Miscellaneous additional utilities for Tower
   ([docs][tu-docs]).
 
 * [`tower-watch`]: A middleware that rebinds the inner service each time a watch
@@ -103,7 +103,7 @@ terms or conditions.
 [tretry-docs]: https://tower-rs.github.io/tower/tower_retry/index.html
 [`tower-timeout`]: tower-timeout
 [tt-docs]: https://tower-rs.github.io/tower/tower_timeout/index.html
-[`tower-util`]: tower-util
+[`tower-service-util`]: tower-service-util
 [tu-docs]: https://tower-rs.github.io/tower/tower_util/index.html
 [`tower-watch`]: tower-watch
 [tw-docs]: https://tower-rs.github.io/tower/tower_watch/index.html

azure-pipelines.yml

@@ -13,20 +13,20 @@ jobs:
     displayName: Test
     vmImage: ubuntu-16.04
     crates:
-      - balance
-      - buffer
-      - discover
-      - filter
-      - in-flight-limit
-      - layer
-      - mock
-      - rate-limit
-      - reconnect
-      - retry
-      - service
-      - timeout
-      - util
-      - watch
+      - tower-balance
+      - tower-buffer
+      - tower-discover
+      - tower-filter
+      - tower-in-flight-limit
+      - tower-layer
+      - tower-mock
+      - tower-rate-limit
+      - tower-reconnect
+      - tower-retry
+      - tower-service
+      - tower-timeout
+      - tower-watch
+      - tower
 
 - template: ci/azure-deploy-docs.yml
   parameters:

ci/azure-test-stable.yml

@@ -13,5 +13,5 @@ jobs:
 
   - ${{ each crate in parameters.crates }}:
     - script: cargo test
-      displayName: cargo test -p tower-${{ crate }}
-      workingDirectory: $(Build.SourcesDirectory)/tower-${{ crate }}
+      displayName: cargo test -p ${{ crate }}
+      workingDirectory: $(Build.SourcesDirectory)/${{ crate }}

tower-util/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-name = "tower-util"
-version = "0.1.0"
-authors = ["Carl Lerche <me@carllerche.com>"]
-publish = false
-
-[dependencies]
-futures = "0.1"
-tower-service = "0.2.0"
-tower-service-util = { version = "0.1.0", path = "../tower-service-util", features = ["io", "either"] }
-
-[dev-dependencies]
-tokio-mock-task = "0.1"

tower-util/README.md

@@ -1,5 +0,0 @@
-# Tower Util
-
-Additional, generally useful, utilities for working with Tower. Contents from
-this crate may eventually be moved into `tower` proper. They are kept here until
-they prove their utility.

tower-util/src/lib.rs

@@ -1,18 +0,0 @@
-//! Various utility types and functions that are generally with Tower.
-
-#[macro_use]
-extern crate futures;
-#[cfg(test)]
-extern crate tokio_mock_task;
-extern crate tower_service;
-extern crate tower_service_util;
-
-pub mod ext;
-
-pub use ext::ServiceExt;
-pub use tower_service_util::BoxService;
-pub use tower_service_util::EitherService;
-pub use tower_service_util::MakeConnection;
-pub use tower_service_util::MakeService;
-pub use tower_service_util::OptionService;
-pub use tower_service_util::ServiceFn;

tower/Cargo.toml

@@ -13,11 +13,16 @@ clients and servers.
 categories = ["asynchronous", "network-programming"]
 keywords = ["io", "async", "non-blocking", "futures", "service"]
 
+[dependencies]
+futures = "0.1"
+tower-service = "0.2.0"
+tower-service-util = { version = "0.1.0", path = "../tower-service-util", features = ["io", "either"] }
+
 [dev-dependencies]
 tower-service = "0.2.0"
-tower-util = { version = "0.1", path = "../tower-util" }
 futures = "0.1"
 log = "0.4.1"
 env_logger = { version = "0.5.3", default-features = false }
 tokio-timer = "0.1"
 futures-cpupool = "0.1"
+tokio-mock-task = "0.1"

tower/examples/channel_service.rs

@@ -12,16 +12,16 @@
 extern crate futures;
 extern crate futures_cpupool;
 extern crate tokio_timer;
+extern crate tower;
 extern crate tower_service;
-extern crate tower_util;
 
 #[macro_use]
 extern crate log;
 
 extern crate env_logger;
 
+use tower::{MakeService, ServiceExt};
 use tower_service::Service;
-use tower_util::{MakeService, ServiceExt};
 
 use futures::future::{Executor, FutureResult};
 use futures::sync::{mpsc, oneshot};

tower/src/ext/call_all.rs

@@ -12,7 +12,7 @@ use tower_service::Service;
 /// # extern crate futures;
 /// # extern crate tower_service;
 /// # extern crate tokio_mock_task;
-/// # extern crate tower_util;
+/// # extern crate tower;
 /// # use futures::future::{ok, FutureResult};
 /// # use futures::{Async, Poll};
 /// # use std::cell::Cell;
@@ -20,7 +20,7 @@ use tower_service::Service;
 /// #
 /// use futures::Stream;
 /// use tower_service::Service;
-/// use tower_util::ServiceExt;
+/// use tower::ServiceExt;
 ///
 /// // First, we need to have a Service to process our requests.
 /// #[derive(Debug, Eq, PartialEq)]

tower/src/lib.rs

@@ -1,6 +1,18 @@
-#![deny(missing_docs, warnings, missing_debug_implementations)]
+//! Various utility types and functions that are generally with Tower.
 
-//! Tower is a library of modular and reusable components for building robust networking
-//! clients and servers.
-//!
-//! This main crate is still a WIP.
+#[macro_use]
+extern crate futures;
+#[cfg(test)]
+extern crate tokio_mock_task;
+extern crate tower_service;
+extern crate tower_service_util;
+
+pub mod ext;
+
+pub use ext::ServiceExt;
+pub use tower_service_util::BoxService;
+pub use tower_service_util::EitherService;
+pub use tower_service_util::MakeConnection;
+pub use tower_service_util::MakeService;
+pub use tower_service_util::OptionService;
+pub use tower_service_util::ServiceFn;