From a91b9a2f9e82374efb640a1c764125145ee41871 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Mon, 17 Sep 2018 16:16:42 -0700
Subject: [PATCH] better ergonomics for aply combinator

---
 src/service/apply.rs |  6 +++---
 src/service/mod.rs   | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/service/apply.rs b/src/service/apply.rs
index 7d1bbabc..8a9ec1ed 100644
--- a/src/service/apply.rs
+++ b/src/service/apply.rs
@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 
 use futures::{Async, Future, IntoFuture, Poll};
 
-use super::{IntoNewService, NewService, Service};
+use super::{IntoNewService, IntoService, NewService, Service};
 
 /// `Apply` service combinator
 pub struct Apply<T, F, R, Req> {
@@ -19,9 +19,9 @@ where
     R: IntoFuture,
 {
     /// Create new `Apply` combinator
-    pub fn new(service: T, f: F) -> Self {
+    pub fn new<I: IntoService<T>>(service: I, f: F) -> Self {
         Self {
-            service,
+            service: service.into_service(),
             f,
             r: PhantomData,
         }
diff --git a/src/service/mod.rs b/src/service/mod.rs
index e5fc63a5..57c3b574 100644
--- a/src/service/mod.rs
+++ b/src/service/mod.rs
@@ -24,16 +24,20 @@ pub use self::map_init_err::MapInitErr;
 /// An extension trait for `Service`s that provides a variety of convenient
 /// adapters
 pub trait ServiceExt: Service {
-    /// Apply function to specified service and use it as a next service in chain.
-    fn apply<S, F, R>(self, service: S, f: F) -> AndThen<Self, Apply<S, F, R, Self::Response>>
+    /// Apply function to specified service and use it as a next service in
+    /// chain.
+    fn apply<S, I, F, R>(
+        self, service: I, f: F,
+    ) -> AndThen<Self, Apply<S, F, R, Self::Response>>
     where
         Self: Sized,
         S: Service,
         S::Error: Into<<R::Future as Future>::Error>,
+        I: IntoService<S>,
         F: Fn(Self::Response, &mut S) -> R,
         R: IntoFuture<Error = Self::Error>,
     {
-        self.and_then(Apply::new(service, f))
+        self.and_then(Apply::new(service.into_service(), f))
     }
 
     /// Call another service after call to this one has resolved successfully.
@@ -102,13 +106,14 @@ pub trait ServiceExt: Service {
 }
 
 pub trait NewServiceExt: NewService {
-    fn apply<S, F, R>(
-        self, service: S, f: F,
+    fn apply<S, I, F, R>(
+        self, service: I, f: F,
     ) -> AndThenNewService<Self, ApplyNewService<S, F, R, Self::Response>>
     where
         Self: Sized,
         S: NewService<InitError = Self::InitError>,
         S::Error: Into<<R::Future as Future>::Error>,
+        I: IntoNewService<S>,
         F: Fn(Self::Response, &mut S::Service) -> R + Clone,
         R: IntoFuture<Error = Self::Error>,
     {