From 983223a83965559885a065adffee97bb6379aa0e Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Wed, 5 Sep 2018 13:54:15 -0700
Subject: [PATCH] add clone impls for combinator services

---
 src/service/and_then.rs         | 13 +++++++++++++
 src/service/apply.rs            | 16 ++++++++++++++++
 src/service/fn_state_service.rs | 17 +++++++++++++++++
 src/service/map.rs              | 17 +++++++++++++++--
 src/service/map_err.rs          | 14 ++++++++++++++
 5 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/src/service/and_then.rs b/src/service/and_then.rs
index 5b0a65f38..ef3a31146 100644
--- a/src/service/and_then.rs
+++ b/src/service/and_then.rs
@@ -26,6 +26,19 @@ where
     }
 }
 
+impl<A, B> Clone for AndThen<A, B>
+where
+    A: Service + Clone,
+    B: Service<Request = A::Response, Error = A::Error>,
+{
+    fn clone(&self) -> Self {
+        AndThen {
+            a: self.a.clone(),
+            b: self.b.clone(),
+        }
+    }
+}
+
 impl<A, B> Service for AndThen<A, B>
 where
     A: Service,
diff --git a/src/service/apply.rs b/src/service/apply.rs
index 58755f6fa..0c29b81c3 100644
--- a/src/service/apply.rs
+++ b/src/service/apply.rs
@@ -27,6 +27,22 @@ where
     }
 }
 
+impl<T, F, R, Req> Clone for Apply<T, F, R, Req>
+where
+    T: Service + Clone,
+    T::Error: Into<<R::Future as Future>::Error>,
+    F: Fn(Req, &mut T) -> R + Clone,
+    R: IntoFuture,
+{
+    fn clone(&self) -> Self {
+        Apply {
+            service: self.service.clone(),
+            f: self.f.clone(),
+            r: PhantomData,
+        }
+    }
+}
+
 impl<T, F, R, Req> Service for Apply<T, F, R, Req>
 where
     T: Service,
diff --git a/src/service/fn_state_service.rs b/src/service/fn_state_service.rs
index 4a76ee363..8b44ce448 100644
--- a/src/service/fn_state_service.rs
+++ b/src/service/fn_state_service.rs
@@ -33,6 +33,23 @@ where
     }
 }
 
+impl<S, F, Req, Resp, Err, Fut> Clone for FnStateService<S, F, Req, Resp, Err, Fut>
+where
+    S: Clone,
+    F: Fn(&mut S, Req) -> Fut + Clone,
+    Fut: IntoFuture<Item = Resp, Error = Err>,
+{
+    fn clone(&self) -> Self {
+        FnStateService {
+            f: self.f.clone(),
+            state: self.state.clone(),
+            req: marker::PhantomData,
+            resp: marker::PhantomData,
+            err: marker::PhantomData,
+        }
+    }
+}
+
 impl<S, F, Req, Resp, Err, Fut> Service for FnStateService<S, F, Req, Resp, Err, Fut>
 where
     F: Fn(&mut S, Req) -> Fut,
diff --git a/src/service/map.rs b/src/service/map.rs
index ac2cb4809..9fa2acf6f 100644
--- a/src/service/map.rs
+++ b/src/service/map.rs
@@ -25,11 +25,24 @@ where
     }
 }
 
+impl<A, F, R> Clone for Map<A, F, R>
+where
+    A: Service + Clone,
+    F: Fn(A::Response) -> R + Clone,
+{
+    fn clone(&self) -> Self {
+        Map {
+            a: self.a.clone(),
+            f: self.f.clone(),
+            r: marker::PhantomData,
+        }
+    }
+}
+
 impl<A, F, R> Service for Map<A, F, R>
 where
     A: Service,
-    F: Fn(A::Response) -> R,
-    F: Clone,
+    F: Fn(A::Response) -> R + Clone,
 {
     type Request = A::Request;
     type Response = R;
diff --git a/src/service/map_err.rs b/src/service/map_err.rs
index bf5199802..b05b635ae 100644
--- a/src/service/map_err.rs
+++ b/src/service/map_err.rs
@@ -25,6 +25,20 @@ where
     }
 }
 
+impl<A, F, E> Clone for MapErr<A, F, E>
+where
+    A: Service + Clone,
+    F: Fn(A::Error) -> E + Clone,
+{
+    fn clone(&self) -> Self {
+        MapErr {
+            a: self.a.clone(),
+            f: self.f.clone(),
+            e: marker::PhantomData,
+        }
+    }
+}
+
 impl<A, F, E> Service for MapErr<A, F, E>
 where
     A: Service,