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

refactor Middleware trait, use Result

Browse Source
This commit is contained in:
Nikolay Kim
2018-01-09 22:48:35 -08:00
parent 16310a5ebd
commit ce78f17a79
9 changed files with 66 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/route.rs
View File

@@ -227,11 +227,11 @@ impl<S: 'static> StartMiddlewares<S> {
return WaitingResponse::init(info, reply)
} else {
match info.mws[info.count].start(&mut info.req) {
MiddlewareStarted::Done =>
Ok(MiddlewareStarted::Done) =>
info.count += 1,
MiddlewareStarted::Response(resp) =>
Ok(MiddlewareStarted::Response(resp)) =>
return RunMiddlewares::init(info, resp),
MiddlewareStarted::Future(mut fut) =>
Ok(MiddlewareStarted::Future(mut fut)) =>
match fut.poll() {
Ok(Async::NotReady) =>
return ComposeState::Starting(StartMiddlewares {
@@ -246,7 +246,7 @@ impl<S: 'static> StartMiddlewares<S> {
Err(err) =>
return Response::init(err.into()),
},
MiddlewareStarted::Err(err) =>
Err(err) =>
return Response::init(err.into()),
}
}
@@ -271,16 +271,16 @@ impl<S: 'static> StartMiddlewares<S> {
} else {
loop {
match info.mws[info.count].start(&mut info.req) {
MiddlewareStarted::Done =>
Ok(MiddlewareStarted::Done) =>
info.count += 1,
MiddlewareStarted::Response(resp) => {
Ok(MiddlewareStarted::Response(resp)) => {
return Some(RunMiddlewares::init(info, resp));
},
MiddlewareStarted::Future(fut) => {
Ok(MiddlewareStarted::Future(fut)) => {
self.fut = Some(fut);
continue 'outer
},
MiddlewareStarted::Err(err) =>
Err(err) =>
return Some(Response::init(err.into()))
}
}
@@ -339,11 +339,11 @@ impl<S: 'static> RunMiddlewares<S> {
loop {
resp = match info.mws[curr].response(&mut info.req, resp) {
MiddlewareResponse::Err(err) => {
Err(err) => {
info.count = curr + 1;
return Response::init(err.into())
},
MiddlewareResponse::Done(r) => {
Ok(MiddlewareResponse::Done(r)) => {
curr += 1;
if curr == len {
return Response::init(r)
@@ -351,7 +351,7 @@ impl<S: 'static> RunMiddlewares<S> {
r
}
},
MiddlewareResponse::Future(fut) => {
Ok(MiddlewareResponse::Future(fut)) => {
return ComposeState::RunMiddlewares(
RunMiddlewares { curr: curr, fut: Some(fut), _s: PhantomData })
},
@@ -382,13 +382,13 @@ impl<S: 'static> RunMiddlewares<S> {
return Some(Response::init(resp));
} else {
match info.mws[self.curr].response(&mut info.req, resp) {
MiddlewareResponse::Err(err) =>
Err(err) =>
return Some(Response::init(err.into())),
MiddlewareResponse::Done(r) => {
Ok(MiddlewareResponse::Done(r)) => {
self.curr += 1;
resp = r
},
MiddlewareResponse::Future(fut) => {
Ok(MiddlewareResponse::Future(fut)) => {
self.fut = Some(fut);
break
},