actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-26 19:47:43 +02:00
Code Issues Releases Wiki Activity

revert IntoFuture change

Browse Source
This commit is contained in:
Nikolay Kim
2019-03-04 21:35:47 -08:00
parent 03f2046a42
commit e8a49801eb
20 changed files with 58 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
actix-utils/Cargo.toml
View File

@ -18,7 +18,8 @@ name = "actix_utils"
path = "src/lib.rs"
[dependencies]
actix-service = "0.3.2"
#actix-service = "0.3.2"
actix-service = { path="../actix-service" }
actix-codec = "0.1.0"
bytes = "0.4"
futures = "0.1.24"

4
actix-utils/src/either.rs
View File

@ -102,8 +102,8 @@ where
fn new_service(&self, cfg: &C) -> Self::Future {
match self {
Either::A(ref inner) => EitherNewService::A(inner.new_service(cfg).into_future()),
Either::B(ref inner) => EitherNewService::B(inner.new_service(cfg).into_future()),
Either::A(ref inner) => EitherNewService::A(inner.new_service(cfg)),
Either::B(ref inner) => EitherNewService::B(inner.new_service(cfg)),
}
}
}

2
actix-utils/src/framed.rs
View File

@ -120,7 +120,7 @@ where
fn call(&mut self, req: Framed<T, U>) -> Self::Future {
FramedServiceResponseFuture {
fut: self.factory.new_service(&self.config).into_future(),
fut: self.factory.new_service(&self.config),
framed: Some(req),
}
}

3
actix-utils/src/stream.rs
View File

@ -4,7 +4,7 @@ use std::rc::Rc;
use actix_service::{IntoNewService, IntoService, NewService, Service};
use futures::future::{ok, Future, FutureResult};
use futures::unsync::mpsc;
use futures::{Async, IntoFuture, Poll, Stream};
use futures::{Async, Poll, Stream};
type Request<T> = Result<<T as IntoStream>::Item, <T as IntoStream>::Error>;
@ -113,7 +113,6 @@ where
Box::new(
self.factory
.new_service(&self.config)
.into_future()
.and_then(move |srv| StreamDispatcher::new(req, srv)),
)
}