actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-08-31 01:40:20 +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

16
actix-service/src/and_then.rs
View File

@@ -1,6 +1,6 @@
use std::marker::PhantomData;
use futures::{try_ready, Async, Future, IntoFuture, Poll};
use futures::{try_ready, Async, Future, Poll};
use super::{IntoNewService, NewService, Service};
use crate::cell::Cell;
@@ -142,10 +142,7 @@ where
type Future = AndThenNewServiceFuture<A, B, C>;
fn new_service(&self, cfg: &C) -> Self::Future {
AndThenNewServiceFuture::new(
self.a.new_service(cfg).into_future(),
self.b.new_service(cfg).into_future(),
)
AndThenNewServiceFuture::new(self.a.new_service(cfg), self.b.new_service(cfg))
}
}
@@ -168,8 +165,8 @@ where
A: NewService<C>,
B: NewService<C, Request = A::Response>,
{
fut_b: <B::Future as IntoFuture>::Future,
fut_a: <A::Future as IntoFuture>::Future,
fut_b: B::Future,
fut_a: A::Future,
a: Option<A::Service>,
b: Option<B::Service>,
}
@@ -179,10 +176,7 @@ where
A: NewService<C>,
B: NewService<C, Request = A::Response>,
{
fn new(
fut_a: <A::Future as IntoFuture>::Future,
fut_b: <B::Future as IntoFuture>::Future,
) -> Self {
fn new(fut_a: A::Future, fut_b: B::Future) -> Self {
AndThenNewServiceFuture {
fut_a,
fut_b,