From 87db4bf741dc9ad2f8b1e1f0834fd5a2a33ee2d8 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Wed, 13 Mar 2019 14:38:33 -0700 Subject: [PATCH] changes --- actix-connect/CHANGES.md | 27 +++------------------------ actix-connect/Cargo.toml | 2 +- actix-connect/src/connector.rs | 2 +- actix-connect/src/error.rs | 6 +----- 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/actix-connect/CHANGES.md b/actix-connect/CHANGES.md index 397ed0a0..c83aecde 100644 --- a/actix-connect/CHANGES.md +++ b/actix-connect/CHANGES.md @@ -1,28 +1,7 @@ # Changes -## [0.3.0] - 2019-03-02 +## [0.1.0] - 2019-03-xx -### Changed +* Refactor resolver and connector services -* Migrate to actix-service 0.3 - - -## [0.2.0] - 2019-02-01 - -### Changed - -* Migrate to actix-service 0.2 - -* Upgrade trust-dns-resolver - -* Use tokio-current-thread instead of direct actix-rt dipendency - - -## [0.1.1] - 2019-01-13 - -* Upgrade trust-dns-proto - - -## [0.1.0] - 2018-12-09 - -* Move server to separate crate +* Rename crate diff --git a/actix-connect/Cargo.toml b/actix-connect/Cargo.toml index 49e77bf1..137728fb 100644 --- a/actix-connect/Cargo.toml +++ b/actix-connect/Cargo.toml @@ -17,7 +17,7 @@ workspace = ".." features = ["ssl"] [lib] -name = "actix_connector" +name = "actix_connect" path = "src/lib.rs" [features] diff --git a/actix-connect/src/connector.rs b/actix-connect/src/connector.rs index 11849a46..ae8be957 100644 --- a/actix-connect/src/connector.rs +++ b/actix-connect/src/connector.rs @@ -96,7 +96,7 @@ impl Future for ConnectorResponse { "TCP connector - successfully connected to connecting to {:?} - {:?}", host, sock.peer_addr() ); - return Ok(Async::Ready(Stream::new(sock, self.host.take().unwrap()))); + return Ok(Async::Ready(Stream::new(sock, host))); } Ok(Async::NotReady) => return Ok(Async::NotReady), Err(err) => { diff --git a/actix-connect/src/error.rs b/actix-connect/src/error.rs index 01e5ae2d..30946459 100644 --- a/actix-connect/src/error.rs +++ b/actix-connect/src/error.rs @@ -13,10 +13,6 @@ pub enum ConnectError { #[display(fmt = "No dns records found for the input")] NoRecords, - /// Connecting took too long - #[display(fmt = "Timeout out while establishing connection")] - Timeout, - /// Invalid input InvalidInput, @@ -26,5 +22,5 @@ pub enum ConnectError { /// Connection io error #[display(fmt = "{}", _0)] - IoError(io::Error), + Io(io::Error), }