simplify With handlers

src/lib.rs

@@ -178,7 +178,6 @@ pub mod dev {
     pub use handler::{Handler, Reply, FromRequest};
     pub use route::Route;
     pub use resource::Resource;
-    pub use with::WithHandler;
     pub use json::JsonBody;
     pub use router::{Router, Pattern};
     pub use param::{FromParam, Params};

src/resource.rs

@@ -10,7 +10,6 @@ use handler::{Reply, Handler, Responder, FromRequest};
 use middleware::Middleware;
 use httprequest::HttpRequest;
 use httpresponse::HttpResponse;
-use with::WithHandler;
 
 /// *Resource* is an entry in route table which corresponds to requested URL.
 ///
@@ -139,8 +138,9 @@ impl<S: 'static> Resource<S> {
     /// ```rust,ignore
     /// Resource::resource("/", |r| r.route().with(index)
     /// ```
-    pub fn with<T, H>(&mut self, handler: H)
+    pub fn with<T, F, R>(&mut self, handler: F)
-        where H: WithHandler<T, S>,
+        where F: Fn(T) -> R + 'static,
+              R: Responder + 'static,
               T: FromRequest<S> + 'static,
     {
         self.routes.push(Route::default());

src/route.rs

@@ -11,7 +11,7 @@ use handler::{Reply, ReplyItem, Handler, FromRequest,
 use middleware::{Middleware, Response as MiddlewareResponse, Started as MiddlewareStarted};
 use httprequest::HttpRequest;
 use httpresponse::HttpResponse;
-use with::{with, with2, with3, WithHandler};
+use with::{With, With2, With3};
 
 /// Resource route definition
 ///
@@ -127,11 +127,12 @@ impl<S: 'static> Route<S> {
     ///        |r| r.method(http::Method::GET).with(index)); // <- use `with` extractor
     /// }
     /// ```
-    pub fn with<T, H>(&mut self, handler: H)
+    pub fn with<T, F, R>(&mut self, handler: F)
-        where H: WithHandler<T, S>,
+        where F: Fn(T) -> R + 'static,
+              R: Responder + 'static,
               T: FromRequest<S> + 'static,
     {
-        self.h(with(handler))
+        self.h(With::new(handler))
     }
 
     /// Set handler function, function has to accept two request extractors.
@@ -170,7 +171,7 @@ impl<S: 'static> Route<S> {
               T1: FromRequest<S> + 'static,
               T2: FromRequest<S> + 'static,
     {
-        self.h(with2(handler))
+        self.h(With2::new(handler))
     }
 
     /// Set handler function, function has to accept three request extractors.
@@ -181,7 +182,7 @@ impl<S: 'static> Route<S> {
               T2: FromRequest<S> + 'static,
               T3: FromRequest<S> + 'static,
     {
-        self.h(with3(handler))
+        self.h(With3::new(handler))
     }
 }
 

src/with.rs

@@ -8,55 +8,27 @@ use handler::{Handler, FromRequest, Reply, ReplyItem, Responder};
 use httprequest::HttpRequest;
 use httpresponse::HttpResponse;
 
-
+pub struct With<T, S, F, R>
-/// Trait defines object that could be registered as route handler
+    where F: Fn(T) -> R
-#[allow(unused_variables)]
-pub trait WithHandler<T, S>: 'static
-    where T: FromRequest<S>, S: 'static
 {
-    /// The type of value that handler will return.
+    hnd: Rc<UnsafeCell<F>>,
-    type Result: Responder;
-
-    /// Handle request
-    fn handle(&mut self, data: T) -> Self::Result;
-}
-
-/// WithHandler<D, T, S> for Fn()
-impl<T, S, F, R> WithHandler<T, S> for F
-    where F: Fn(T) -> R + 'static,
-          R: Responder + 'static,
-          T: FromRequest<S>,
-          S: 'static,
-{
-    type Result = R;
-
-    fn handle(&mut self, item: T) -> R {
-        (self)(item)
-    }
-}
-
-pub(crate)
-fn with<T, S, H>(h: H) -> With<T, S, H>
-    where H: WithHandler<T, S>,
-          T: FromRequest<S>,
-{
-    With{hnd: Rc::new(UnsafeCell::new(h)), _t: PhantomData, _s: PhantomData}
-}
-
-pub struct With<T, S, H>
-    where H: WithHandler<T, S> + 'static,
-          T: FromRequest<S>,
-          S: 'static,
-{
-    hnd: Rc<UnsafeCell<H>>,
     _t: PhantomData<T>,
     _s: PhantomData<S>,
 }
 
-impl<T, S, H> Handler<S> for With<T, S, H>
+impl<T, S, F, R> With<T, S, F, R>
-    where H: WithHandler<T, S>,
+    where F: Fn(T) -> R,
+{
+    pub fn new(f: F) -> Self {
+        With{hnd: Rc::new(UnsafeCell::new(f)), _t: PhantomData, _s: PhantomData}
+    }
+}
+
+impl<T, S, F, R> Handler<S> for With<T, S, F, R>
+    where F: Fn(T) -> R + 'static,
+          R: Responder + 'static,
           T: FromRequest<S> + 'static,
-          S: 'static, H: 'static
+          S: 'static
 {
     type Result = Reply;
 
@@ -77,20 +49,22 @@ impl<T, S, H> Handler<S> for With<T, S, H>
     }
 }
 
-struct WithHandlerFut<T, S, H>
+struct WithHandlerFut<T, S, F, R>
-    where H: WithHandler<T, S>,
+    where F: Fn(T) -> R,
-          T: FromRequest<S>,
+          R: Responder,
-          T: 'static, S: 'static
+          T: FromRequest<S> + 'static,
+          S: 'static
 {
     started: bool,
-    hnd: Rc<UnsafeCell<H>>,
+    hnd: Rc<UnsafeCell<F>>,
     req: HttpRequest<S>,
     fut1: Option<Box<Future<Item=T, Error=Error>>>,
     fut2: Option<Box<Future<Item=HttpResponse, Error=Error>>>,
 }
 
-impl<T, S, H> Future for WithHandlerFut<T, S, H>
+impl<T, S, F, R> Future for WithHandlerFut<T, S, F, R>
-    where H: WithHandler<T, S>,
+    where F: Fn(T) -> R,
+          R: Responder + 'static,
           T: FromRequest<S> + 'static,
           S: 'static
 {
@@ -120,38 +94,23 @@ impl<T, S, H> Future for WithHandlerFut<T, S, H>
             }
         };
 
-        let hnd: &mut H = unsafe{&mut *self.hnd.get()};
+        let hnd: &mut F = unsafe{&mut *self.hnd.get()};
-        let item = match hnd.handle(item).respond_to(self.req.without_state()) {
+        let item = match (*hnd)(item).respond_to(self.req.without_state()) {
             Ok(item) => item.into(),
-            Err(err) => return Err(err.into()),
+            Err(e) => return Err(e.into()),
         };
 
         match item.into() {
-            ReplyItem::Message(resp) => return Ok(Async::Ready(resp)),
+            ReplyItem::Message(resp) => Ok(Async::Ready(resp)),
-            ReplyItem::Future(fut) => self.fut2 = Some(fut),
+            ReplyItem::Future(fut) => {
+                self.fut2 = Some(fut);
+                self.poll()
+            }
         }
-
-        self.poll()
     }
 }
 
-pub(crate)
+pub struct With2<T1, T2, S, F, R> where F: Fn(T1, T2) -> R
-fn with2<T1, T2, S, F, R>(h: F) -> With2<T1, T2, S, F, R>
-    where F: Fn(T1, T2) -> R,
-          R: Responder,
-          T1: FromRequest<S>,
-          T2: FromRequest<S>,
-{
-    With2{hnd: Rc::new(UnsafeCell::new(h)),
-          _t1: PhantomData, _t2: PhantomData, _s: PhantomData}
-}
-
-pub struct With2<T1, T2, S, F, R>
-    where F: Fn(T1, T2) -> R,
-          R: Responder,
-          T1: FromRequest<S>,
-          T2: FromRequest<S>,
-          S: 'static,
 {
     hnd: Rc<UnsafeCell<F>>,
     _t1: PhantomData<T1>,
@@ -159,6 +118,14 @@ pub struct With2<T1, T2, S, F, R>
     _s: PhantomData<S>,
 }
 
+impl<T1, T2, S, F, R> With2<T1, T2, S, F, R> where F: Fn(T1, T2) -> R
+{
+    pub fn new(f: F) -> Self {
+        With2{hnd: Rc::new(UnsafeCell::new(f)),
+              _t1: PhantomData, _t2: PhantomData, _s: PhantomData}
+    }
+}
+
 impl<T1, T2, S, F, R> Handler<S> for With2<T1, T2, S, F, R>
     where F: Fn(T1, T2) -> R + 'static,
           R: Responder + 'static,
@@ -289,26 +256,7 @@ impl<T1, T2, S, F, R> Future for WithHandlerFut2<T1, T2, S, F, R>
     }
 }
 
-pub(crate)
+pub struct With3<T1, T2, T3, S, F, R> where F: Fn(T1, T2, T3) -> R {
-fn with3<T1, T2, T3, S, F, R>(h: F) -> With3<T1, T2, T3, S, F, R>
-    where F: Fn(T1, T2, T3) -> R + 'static,
-          R: Responder,
-          T1: FromRequest<S>,
-          T2: FromRequest<S>,
-          T3: FromRequest<S>,
-{
-    With3{hnd: Rc::new(UnsafeCell::new(h)),
-          _s: PhantomData, _t1: PhantomData, _t2: PhantomData, _t3: PhantomData}
-}
-
-pub struct With3<T1, T2, T3, S, F, R>
-    where F: Fn(T1, T2, T3) -> R + 'static,
-          R: Responder + 'static,
-          T1: FromRequest<S>,
-          T2: FromRequest<S>,
-          T3: FromRequest<S>,
-          S: 'static,
-{
     hnd: Rc<UnsafeCell<F>>,
     _t1: PhantomData<T1>,
     _t2: PhantomData<T2>,
@@ -316,6 +264,16 @@ pub struct With3<T1, T2, T3, S, F, R>
     _s: PhantomData<S>,
 }
 
+
+impl<T1, T2, T3, S, F, R> With3<T1, T2, T3, S, F, R>
+    where F: Fn(T1, T2, T3) -> R,
+{
+    pub fn new(f: F) -> Self {
+        With3{hnd: Rc::new(UnsafeCell::new(f)),
+              _s: PhantomData, _t1: PhantomData, _t2: PhantomData, _t3: PhantomData}
+    }
+}
+
 impl<T1, T2, T3, S, F, R> Handler<S> for With3<T1, T2, T3, S, F, R>
     where F: Fn(T1, T2, T3) -> R + 'static,
           R: Responder + 'static,