1
0
mirror of https://github.com/fafhrd91/actix-net synced 2025-08-23 00:45:07 +02:00

change to IntoFuture

This commit is contained in:
Nikolay Kim
2019-03-04 20:29:35 -08:00
parent 700abc997e
commit ed14e6b8ea
15 changed files with 89 additions and 64 deletions

View File

@@ -1,6 +1,6 @@
use std::marker::PhantomData;
use futures::{Future, Poll};
use futures::{Future, IntoFuture, Poll};
use super::NewService;
@@ -54,7 +54,7 @@ where
type Future = MapInitErrFuture<A, F, E, C>;
fn new_service(&self, cfg: &C) -> Self::Future {
MapInitErrFuture::new(self.a.new_service(cfg), self.f.clone())
MapInitErrFuture::new(self.a.new_service(cfg).into_future(), self.f.clone())
}
}
@@ -64,7 +64,7 @@ where
F: Fn(A::InitError) -> E,
{
f: F,
fut: A::Future,
fut: <A::Future as IntoFuture>::Future,
}
impl<A, F, E, C> MapInitErrFuture<A, F, E, C>
@@ -72,7 +72,7 @@ where
A: NewService<C>,
F: Fn(A::InitError) -> E,
{
fn new(fut: A::Future, f: F) -> Self {
fn new(fut: <A::Future as IntoFuture>::Future, f: F) -> Self {
MapInitErrFuture { f, fut }
}
}