From 65a313c78b16272bf7918459111fdb1117ad2ca2 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Mon, 4 Mar 2019 19:51:09 -0800
Subject: [PATCH] update utils dep
---
Cargo.toml | 4 ++--
src/client/connector.rs | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 403f3303..35342b8e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,10 +37,10 @@ session = ["cookie/secure"]
ssl = ["openssl", "actix-connector/ssl"]
[dependencies]
-actix-service = "0.3.0"
+actix-service = "0.3.1"
actix-codec = "0.1.0"
actix-connector = "0.3.0"
-actix-utils = "0.3.0"
+actix-utils = "0.3.1"
base64 = "0.10"
backtrace = "0.3"
diff --git a/src/client/connector.rs b/src/client/connector.rs
index 32ba5012..ccb5dbce 100644
--- a/src/client/connector.rs
+++ b/src/client/connector.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
use actix_codec::{AsyncRead, AsyncWrite};
use actix_connector::{Resolver, TcpConnector};
-use actix_service::{Apply, Service, ServiceExt};
+use actix_service::{Service, ServiceExt};
use actix_utils::timeout::{TimeoutError, TimeoutService};
use trust_dns_resolver::config::{ResolverConfig, ResolverOpts};
@@ -140,8 +140,8 @@ impl Connector {
> + Clone {
#[cfg(not(feature = "ssl"))]
{
- let connector = Apply::new(
- TimeoutService::new(self.timeout),
+ let connector = TimeoutService::new(
+ self.timeout,
self.resolver.map_err(ConnectorError::from).and_then(
TcpConnector::default()
.from_err()
@@ -168,8 +168,8 @@ impl Connector {
const H2: &[u8] = b"h2";
use actix_connector::ssl::OpensslConnector;
- let ssl_service = Apply::new(
- TimeoutService::new(self.timeout),
+ let ssl_service = TimeoutService::new(
+ self.timeout,
self.resolver
.clone()
.map_err(ConnectorError::from)
@@ -197,8 +197,8 @@ impl Connector {
TimeoutError::Timeout => ConnectorError::Timeout,
});
- let tcp_service = Apply::new(
- TimeoutService::new(self.timeout),
+ let tcp_service = TimeoutService::new(
+ self.timeout,
self.resolver.map_err(ConnectorError::from).and_then(
TcpConnector::default()
.from_err()