actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-07-01 00:44:26 +02:00
Code Issues Releases Wiki Activity

revert generic request parameter for service; support ServerConfig as new factory config

Browse Source
This commit is contained in:
Nikolay Kim
2019-03-09 09:49:11 -08:00
parent aadcdaa3d6
commit fde55ffa14
14 changed files with 581 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/scope.rs
View File

@ -81,7 +81,7 @@ impl<P, T> Scope<P, T>
where
P: 'static,
T: NewService<
ServiceRequest<P>,
Request = ServiceRequest<P>,
Response = ServiceResponse,
Error = (),
InitError = (),
@ -174,7 +174,7 @@ where
where
F: FnOnce(Resource<P>) -> Resource<P, U>,
U: NewService<
ServiceRequest<P>,
Request = ServiceRequest<P>,
Response = ServiceResponse,
Error = (),
InitError = (),
@ -199,7 +199,7 @@ where
) -> Scope<
P,
impl NewService<
ServiceRequest<P>,
Request = ServiceRequest<P>,
Response = ServiceResponse,
Error = (),
InitError = (),
@ -208,12 +208,12 @@ where
where
M: Transform<
T::Service,
ServiceRequest<P>,
Request = ServiceRequest<P>,
Response = ServiceResponse,
Error = (),
InitError = (),
>,
F: IntoTransform<M, T::Service, ServiceRequest<P>>,
F: IntoTransform<M, T::Service>,
{
let endpoint = ApplyTransform::new(mw, self.endpoint);
Scope {
@ -231,7 +231,7 @@ impl<P, T> HttpServiceFactory<P> for Scope<P, T>
where
P: 'static,
T: NewService<
ServiceRequest<P>,
Request = ServiceRequest<P>,
Response = ServiceResponse,
Error = (),
InitError = (),
@ -287,7 +287,8 @@ pub struct ScopeFactory<P> {
default: Rc<RefCell<Option<Rc<HttpNewService<P>>>>>,
}
impl<P: 'static> NewService<ServiceRequest<P>> for ScopeFactory<P> {
impl<P: 'static> NewService for ScopeFactory<P> {
type Request = ServiceRequest<P>;
type Response = ServiceResponse;
type Error = ();
type InitError = ();
@ -402,7 +403,8 @@ pub struct ScopeService<P> {
_ready: Option<(ServiceRequest<P>, ResourceInfo)>,
}
impl<P> Service<ServiceRequest<P>> for ScopeService<P> {
impl<P> Service for ScopeService<P> {
type Request = ServiceRequest<P>;
type Response = ServiceResponse;
type Error = ();
type Future = Either<BoxedResponse, FutureResult<Self::Response, Self::Error>>;
@ -445,7 +447,8 @@ impl<P> ScopeEndpoint<P> {
}
}
impl<P: 'static> NewService<ServiceRequest<P>> for ScopeEndpoint<P> {
impl<P: 'static> NewService for ScopeEndpoint<P> {
type Request = ServiceRequest<P>;
type Response = ServiceResponse;
type Error = ();
type InitError = ();