actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 14:49:20 +02:00
Code Issues Releases Wiki Activity

update actix-service

Browse Source
This commit is contained in:
Nikolay Kim
2019-03-05 09:30:11 -08:00
parent 3a456ec148
commit ce0b172598
14 changed files with 105 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test-server/Cargo.toml
View File

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

12
test-server/src/lib.rs
View File

@ -56,8 +56,7 @@ impl TestServer {
pub fn new<F: StreamServiceFactory>(
factory: F,
) -> TestServerRuntime<
impl Service<Request = Connect, Response = impl Connection, Error = ConnectorError>
+ Clone,
impl Service<Connect, Response = impl Connection, Error = ConnectorError> + Clone,
> {
let (tx, rx) = mpsc::channel();
@ -89,11 +88,8 @@ impl TestServer {
}
fn new_connector(
) -> impl Service<
Request = Connect,
Response = impl Connection,
Error = ConnectorError,
> + Clone {
) -> impl Service<Connect, Response = impl Connection, Error = ConnectorError> + Clone
{
#[cfg(feature = "ssl")]
{
use openssl::ssl::{SslConnector, SslMethod, SslVerifyMode};
@ -206,7 +202,7 @@ impl<T> TestServerRuntime<T> {
impl<T> TestServerRuntime<T>
where
T: Service<Request = Connect, Error = ConnectorError> + Clone,
T: Service<Connect, Error = ConnectorError> + Clone,
T::Response: Connection,
{
/// Connect to websocket server at a given path