actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-08-30 19:10:20 +02:00
Code Issues Releases Wiki Activity

update actix-service dependency

Browse Source
This commit is contained in:
Nikolay Kim
2019-03-04 20:46:33 -08:00
parent 65a313c78b
commit 3a456ec148
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/h1/service.rs
View File

@@ -6,7 +6,7 @@ use actix_codec::{AsyncRead, AsyncWrite, Framed};
use actix_service::{IntoNewService, NewService, Service};
use actix_utils::cloneable::CloneableService;
use futures::future::{ok, FutureResult};
use futures::{try_ready, Async, Future, Poll, Stream};
use futures::{try_ready, Async, Future, IntoFuture, Poll, Stream};
use log::error;
use crate::body::MessageBody;
@@ -78,7 +78,7 @@ where
fn new_service(&self, _: &()) -> Self::Future {
H1ServiceResponse {
fut: self.srv.new_service(&()),
fut: self.srv.new_service(&()).into_future(),
cfg: Some(self.cfg.clone()),
_t: PhantomData,
}
@@ -216,7 +216,7 @@ where
#[doc(hidden)]
pub struct H1ServiceResponse<T, S: NewService, B> {
fut: S::Future,
fut: <S::Future as IntoFuture>::Future,
cfg: Option<ServiceConfig>,
_t: PhantomData<(T, B)>,
}

6
src/h2/service.rs
View File

@@ -7,7 +7,7 @@ use actix_service::{IntoNewService, NewService, Service};
use actix_utils::cloneable::CloneableService;
use bytes::Bytes;
use futures::future::{ok, FutureResult};
use futures::{try_ready, Async, Future, Poll, Stream};
use futures::{try_ready, Async, Future, IntoFuture, Poll, Stream};
use h2::server::{self, Connection, Handshake};
use h2::RecvStream;
use log::error;
@@ -72,7 +72,7 @@ where
fn new_service(&self, _: &()) -> Self::Future {
H2ServiceResponse {
fut: self.srv.new_service(&()),
fut: self.srv.new_service(&()).into_future(),
cfg: Some(self.cfg.clone()),
_t: PhantomData,
}
@@ -230,7 +230,7 @@ where
#[doc(hidden)]
pub struct H2ServiceResponse<T, S: NewService, B> {
fut: S::Future,
fut: <S::Future as IntoFuture>::Future,
cfg: Option<ServiceConfig>,
_t: PhantomData<(T, B)>,
}