actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-24 08:22:59 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.toml
View File

@ -37,7 +37,7 @@ session = ["cookie/secure"]
ssl = ["openssl", "actix-connector/ssl"] ssl = ["openssl", "actix-connector/ssl"]
[dependencies] [dependencies]
actix-service = "0.3.1" actix-service = "0.3.2"
actix-codec = "0.1.0" actix-codec = "0.1.0"
actix-connector = "0.3.0" actix-connector = "0.3.0"
actix-utils = "0.3.1" actix-utils = "0.3.1"
@ -78,7 +78,8 @@ openssl = { version="0.10", optional = true }
[dev-dependencies] [dev-dependencies]
actix-rt = "0.1.0" actix-rt = "0.1.0"
actix-server = { version = "0.3.0", features=["ssl"] } #actix-server = { version = "0.3.0", features=["ssl"] }
actix-server = { git="https://github.com/actix/actix-net.git", features=["ssl"] }
actix-connector = { version = "0.3.0", features=["ssl"] } actix-connector = { version = "0.3.0", features=["ssl"] }
actix-http-test = { path="test-server", features=["ssl"] } actix-http-test = { path="test-server", features=["ssl"] }
env_logger = "0.6" env_logger = "0.6"

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

7
test-server/Cargo.toml
View File

@ -35,9 +35,10 @@ ssl = ["openssl", "actix-http/ssl", "actix-server/ssl"]
actix-codec = "0.1" actix-codec = "0.1"
actix-rt = "0.1.0" actix-rt = "0.1.0"
actix-http = { path=".." } actix-http = { path=".." }
actix-service = "0.3.0" actix-service = "0.3.2"
actix-server = "0.3.0" #actix-server = "0.3.0"
actix-utils = "0.3.0" actix-server = { git="https://github.com/actix/actix-net.git" }
actix-utils = "0.3.2"
base64 = "0.10" base64 = "0.10"
bytes = "0.4" bytes = "0.4"