From edff66dc32361ee7335ce4e9b37adbe534d5f788 Mon Sep 17 00:00:00 2001
From: Maksym Vorobiov <maxim.vorobjov@gmail.com>
Date: Tue, 25 Feb 2020 22:27:38 +0200
Subject: [PATCH] remove resolver feature

---
 actix-http/Cargo.toml   | 3 +--
 actix-http/src/error.rs | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 3ff70064b..74fa46612 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -41,7 +41,6 @@ secure-cookies = ["ring"]
 
 # support for actix Actor messages
 actix = ["actix"]
-resolver = ["actix/resolver"]
 
 [dependencies]
 actix-service = "1.0.1"
@@ -51,7 +50,7 @@ actix-utils = "1.0.3"
 actix-rt = "1.0.0"
 actix-threadpool = "0.3.1"
 actix-tls = { version = "1.0.0", optional = true }
-actix = { version = "0.10.0-alpha.1", default_features = false, optional = true }
+actix = { version = "0.10.0-alpha.1", optional = true }
 
 base64 = "0.11"
 bitflags = "1.2"
diff --git a/actix-http/src/error.rs b/actix-http/src/error.rs
index 5a2ecb09a..cfd24c7b6 100644
--- a/actix-http/src/error.rs
+++ b/actix-http/src/error.rs
@@ -955,7 +955,7 @@ impl ResponseError for fail_ure::Error {}
 /// `InternalServerError` for `actix::MailboxError`
 impl ResponseError for actix::MailboxError {} 
 
-#[cfg(all(feature = "actix", feature = "resolver"))]
+#[cfg(feature = "actix")]
 /// `InternalServerError` for `actix::ResolverError`
 impl ResponseError for actix::actors::resolver::ResolverError {}