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

use actix_web::Error for middleware errors

Browse Source
This commit is contained in:
Nikolay Kim
2019-03-10 16:35:38 -07:00
parent 79875ea039
commit 4d96abb639
13 changed files with 305 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/resource.rs
View File

@@ -17,8 +17,9 @@ use crate::responder::Responder;
use crate::route::{CreateRouteService, Route, RouteService};
use crate::service::{ServiceRequest, ServiceResponse};
type HttpService<P> = BoxedService<ServiceRequest<P>, ServiceResponse, ()>;
type HttpNewService<P> = BoxedNewService<(), ServiceRequest<P>, ServiceResponse, (), ()>;
type HttpService<P> = BoxedService<ServiceRequest<P>, ServiceResponse, Error>;
type HttpNewService<P> =
BoxedNewService<(), ServiceRequest<P>, ServiceResponse, Error, ()>;
/// *Resource* is an entry in route table which corresponds to requested URL.
///
@@ -70,7 +71,7 @@ where
T: NewService<
Request = ServiceRequest<P>,
Response = ServiceResponse,
Error = (),
Error = Error,
InitError = (),
>,
{
@@ -232,7 +233,7 @@ where
impl NewService<
Request = ServiceRequest<P>,
Response = ServiceResponse,
Error = (),
Error = Error,
InitError = (),
>,
>
@@ -241,7 +242,7 @@ where
T::Service,
Request = ServiceRequest<P>,
Response = ServiceResponse,
Error = (),
Error = Error,
InitError = (),
>,
F: IntoTransform<M, T::Service>,
@@ -266,7 +267,7 @@ where
U: NewService<
Request = ServiceRequest<P>,
Response = ServiceResponse,
Error = (),
Error = Error,
> + 'static,
{
// create and configure default resource
@@ -284,7 +285,7 @@ where
T: NewService<
Request = ServiceRequest<P>,
Response = ServiceResponse,
Error = (),
Error = Error,
InitError = (),
> + 'static,
{
@@ -314,7 +315,7 @@ where
T: NewService<
Request = ServiceRequest<P>,
Response = ServiceResponse,
Error = (),
Error = Error,
InitError = (),
>,
{
@@ -336,7 +337,7 @@ pub struct ResourceFactory<P> {
impl<P: 'static> NewService for ResourceFactory<P> {
type Request = ServiceRequest<P>;
type Response = ServiceResponse;
type Error = ();
type Error = Error;
type InitError = ();
type Service = ResourceService<P>;
type Future = CreateResourceService<P>;
@@ -427,9 +428,9 @@ pub struct ResourceService<P> {
impl<P> Service for ResourceService<P> {
type Request = ServiceRequest<P>;
type Response = ServiceResponse;
type Error = ();
type Error = Error;
type Future = Either<
Box<Future<Item = ServiceResponse, Error = ()>>,
Box<Future<Item = ServiceResponse, Error = Error>>,
Either<
Box<Future<Item = Self::Response, Error = Self::Error>>,
FutureResult<Self::Response, Self::Error>,
@@ -472,7 +473,7 @@ impl<P> ResourceEndpoint<P> {
impl<P: 'static> NewService for ResourceEndpoint<P> {
type Request = ServiceRequest<P>;
type Response = ServiceResponse;
type Error = ();
type Error = Error;
type InitError = ();
type Service = ResourceService<P>;
type Future = CreateResourceService<P>;