From 23dcf3631e08dcbe3d23e65a4b805e0acfb9f772 Mon Sep 17 00:00:00 2001
From: David Pedersen <david.pdrsn@gmail.com>
Date: Thu, 19 Aug 2021 22:44:26 +0200
Subject: [PATCH] Export `Or` in a more consistent way

---
 src/routing/future.rs |  2 ++
 src/routing/mod.rs    | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/routing/future.rs b/src/routing/future.rs
index 3ed4ba66..99a08d23 100644
--- a/src/routing/future.rs
+++ b/src/routing/future.rs
@@ -14,6 +14,8 @@ use tower::{
     BoxError, Service,
 };
 
+pub use super::or::ResponseFuture as OrResponseFuture;
+
 opaque_future! {
     /// Response future for [`EmptyRouter`](super::EmptyRouter).
     pub type EmptyRouterFuture<E> =
diff --git a/src/routing/mod.rs b/src/routing/mod.rs
index eb2ffc91..b5228651 100644
--- a/src/routing/mod.rs
+++ b/src/routing/mod.rs
@@ -29,9 +29,9 @@ use tower::{
 use tower_http::map_response_body::MapResponseBodyLayer;
 
 pub mod future;
-pub mod or;
+mod or;
 
-pub use self::method_filter::MethodFilter;
+pub use self::{method_filter::MethodFilter, or::Or};
 
 mod method_filter;
 
@@ -479,7 +479,8 @@ impl<S> Router<S> {
     /// # async fn teams_list() {}
     ///
     /// // define some routes separately
-    /// let user_routes = Router::new().route("/users", get(users_list))
+    /// let user_routes = Router::new()
+    ///     .route("/users", get(users_list))
     ///     .route("/users/:id", get(users_show));
     ///
     /// let team_routes = Router::new().route("/teams", get(teams_list));
@@ -490,8 +491,8 @@ impl<S> Router<S> {
     /// # hyper::Server::bind(&"".parse().unwrap()).serve(app.into_make_service()).await.unwrap();
     /// # };
     /// ```
-    pub fn or<S2>(self, other: S2) -> Router<or::Or<S, S2>> {
-        self.map(|first| or::Or {
+    pub fn or<S2>(self, other: S2) -> Router<Or<S, S2>> {
+        self.map(|first| Or {
             first,
             second: other,
         })