From 33c827921f9398107b652e08d0f681bb1d060585 Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Tue, 19 Jan 2021 01:55:30 +0800
Subject: [PATCH] add changelog. fix Resolve trait

---
 actix-tls/CHANGES.md             |  6 ++++++
 actix-tls/src/connect/resolve.rs | 12 ++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/actix-tls/CHANGES.md b/actix-tls/CHANGES.md
index 1a7ef7a7..17741864 100644
--- a/actix-tls/CHANGES.md
+++ b/actix-tls/CHANGES.md
@@ -1,6 +1,12 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+* Remove `trust-dns-proto` and `trust-dns-resolver` [#248]
+* Use `tokio::net::lookup_host` for as simple and basic default resolver [#248]
+* Add `Resolve` trait for custom dns resolver. Add `Resolver::new_custom` function
+  to construct custom resolvers.[#248]
+
+[#248]: https://github.com/actix/actix-net/pull/248
 
 
 ## 3.0.0-beta.2 - 2021-xx-xx
diff --git a/actix-tls/src/connect/resolve.rs b/actix-tls/src/connect/resolve.rs
index 6d31f461..5e2b7257 100644
--- a/actix-tls/src/connect/resolve.rs
+++ b/actix-tls/src/connect/resolve.rs
@@ -1,8 +1,4 @@
-use std::{
-    net::{SocketAddr, ToSocketAddrs},
-    rc::Rc,
-    task::Poll,
-};
+use std::{net::SocketAddr, rc::Rc, task::Poll};
 
 use actix_service::{Service, ServiceFactory};
 use futures_core::future::LocalBoxFuture;
@@ -52,7 +48,7 @@ pub enum Resolver {
 pub trait Resolve {
     fn lookup(
         &self,
-        addrs: Vec<SocketAddr>,
+        addrs: String,
     ) -> LocalBoxFuture<'_, Result<Vec<SocketAddr>, Box<dyn std::error::Error>>>;
 }
 
@@ -81,10 +77,6 @@ impl Resolver {
                 Ok(res.collect())
             }
             Self::Custom(resolver) => {
-                let host = host
-                    .to_socket_addrs()
-                    .map_err(|e| ConnectError::Resolver(Box::new(e)))?
-                    .collect();
                 resolver.lookup(host).await.map_err(ConnectError::Resolver)
             }
         }