actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-08-31 08:57:00 +02:00
Code Issues Releases Wiki Activity

simplify With handlers

Browse Source
This commit is contained in:
Nikolay Kim
2018-03-31 09:58:33 -07:00
parent 16c212f853
commit 8791c0f880
4 changed files with 62 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/route.rs
View File

@@ -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)
where H: WithHandler<T, S>,
pub fn with<T, F, R>(&mut self, handler: F)
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))
}
}