From 486c533989a97c4da5ea6867e1da820a164157a8 Mon Sep 17 00:00:00 2001
From: Lucio Franco <luciofranco14@gmail.com>
Date: Wed, 3 Apr 2019 12:12:11 -0400
Subject: [PATCH] tower: Reexport all layers and add layer::util mod (#224)

* tower: Reexport all layers and add layer::util mod

* Fix crate names and layerext
---
 tower/src/layer.rs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/tower/src/layer.rs b/tower/src/layer.rs
index ebedd2c..9613286 100644
--- a/tower/src/layer.rs
+++ b/tower/src/layer.rs
@@ -1,9 +1,19 @@
 //! A collection of `Layer` based tower services
 
 pub use tower_layer::Layer;
-// TODO: Should this be re-exported?
-pub use tower_util::layer::Chain;
-pub use tower_util::layer::Identity;
+
+pub use buffer::BufferLayer;
+pub use filter::FilterLayer;
+pub use in_flight_limit::InFlightLimitLayer;
+pub use load_shed::LoadShedLayer;
+pub use rate_limit::RateLimitLayer;
+pub use retry::RetryLayer;
+pub use timeout::TimeoutLayer;
+
+pub mod util {
+    pub use tower_util::layer::Chain;
+    pub use tower_util::layer::Identity;
+}
 
 /// An extension trait for `Layer`'s that provides a variety of convenient
 /// adapters.
@@ -12,12 +22,12 @@ pub trait LayerExt<S, Request>: Layer<S, Request> {
     /// `middleware` to services being wrapped.
     ///
     /// This defines a middleware stack.
-    fn chain<T>(self, middleware: T) -> Chain<Self, T>
+    fn chain<T>(self, middleware: T) -> util::Chain<Self, T>
     where
         T: Layer<Self::Service, Request>,
         Self: Sized,
     {
-        Chain::new(self, middleware)
+        util::Chain::new(self, middleware)
     }
 }