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

make Task private

Browse Source
This commit is contained in:
Nikolay Kim
2017-11-30 15:13:56 -08:00
parent 271a292ea5
commit 07cc017320
7 changed files with 61 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pipeline.rs
View File

@@ -4,14 +4,15 @@ use std::rc::Rc;
use futures::{Async, Poll, Future};
use task::Task;
use route::Reply;
use error::Error;
use middlewares::{Middleware, Finished, Started, Response};
use h1writer::Writer;
use httprequest::HttpRequest;
use httpresponse::HttpResponse;
use middlewares::{Middleware, Finished, Started, Response};
type Handler = Fn(HttpRequest, &mut Task);
pub(crate) type PipelineHandler<'a> = &'a Fn(HttpRequest, &mut Task);
type Handler = Fn(HttpRequest) -> Reply;
pub(crate) type PipelineHandler<'a> = &'a Fn(HttpRequest) -> Reply;
pub struct Pipeline(PipelineState);
@@ -29,8 +30,7 @@ impl Pipeline {
pub fn new(req: HttpRequest, mw: Rc<Vec<Box<Middleware>>>, handler: PipelineHandler) -> Pipeline
{
if mw.is_empty() {
let mut task = Task::default();
(handler)(req.clone(), &mut task);
let task = Task::new((handler)(req.clone()));
Pipeline(PipelineState::Task(Box::new((task, req))))
} else {
match Start::init(mw, req, handler) {
@@ -195,8 +195,7 @@ impl Start {
let len = self.middlewares.len();
loop {
if self.idx == len {
let mut task = Task::default();
(unsafe{&*self.hnd})(self.req.clone(), &mut task);
let task = Task::new((unsafe{&*self.hnd})(self.req.clone()));
return Ok(StartResult::Ready(
Box::new(Handle::new(self.idx-1, self.req.clone(),
self.prepare(task), self.middlewares))))
@@ -247,8 +246,7 @@ impl Start {
Rc::clone(&self.middlewares)))))
}
if self.idx == len {
let mut task = Task::default();
(unsafe{&*self.hnd})(self.req.clone(), &mut task);
let task = Task::new((unsafe{&*self.hnd})(self.req.clone()));
return Ok(Async::Ready(Box::new(Handle::new(
self.idx-1, self.req.clone(),
self.prepare(task), Rc::clone(&self.middlewares)))))