From e52f7152c7b4023b03796abb40ff469fb5b499a4 Mon Sep 17 00:00:00 2001
From: Marat Safin <jeizsm@gmail.com>
Date: Sun, 21 Jul 2019 14:26:32 +0300
Subject: [PATCH] fix features conflict

---
 actix-http/src/client/connector.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/actix-http/src/client/connector.rs b/actix-http/src/client/connector.rs
index 463f318d5..701212ab7 100644
--- a/actix-http/src/client/connector.rs
+++ b/actix-http/src/client/connector.rs
@@ -19,11 +19,11 @@ use super::Connect;
 #[cfg(feature = "ssl")]
 use openssl::ssl::SslConnector;
 
-#[cfg(feature = "rust-tls")]
+#[cfg(all(not(feature = "ssl"), feature = "rust-tls"))]
 use rustls::{Session, ClientConfig};
-#[cfg(feature = "rust-tls")]
+#[cfg(all(not(feature = "ssl"), feature = "rust-tls"))]
 use std::sync::Arc;
-#[cfg(feature = "rust-tls")]
+#[cfg(all(not(feature = "ssl"), feature = "rust-tls"))]
 type SslConnector = Arc<ClientConfig>;
 
 #[cfg(all(not(feature = "ssl"), not(feature = "rust-tls")))]
@@ -74,7 +74,7 @@ impl Connector<(), ()> {
                     .map_err(|e| error!("Can not set alpn protocol: {:?}", e));
                 ssl.build()
             }
-            #[cfg(feature = "rust-tls")]
+            #[cfg(all(not(feature = "ssl"), feature = "rust-tls"))]
             {
                 let protos = vec![b"h2".to_vec(), b"http/1.1".to_vec()];
                 let mut config = ClientConfig::new();
@@ -287,7 +287,7 @@ where
                 ),
             }
         }
-        #[cfg(feature = "rust-tls")]
+        #[cfg(all(not(feature = "ssl"), feature = "rust-tls"))]
         {
             const H2: &[u8] = b"h2";
             use actix_connect::ssl::RustlsConnector;
@@ -560,7 +560,7 @@ mod connect_impl {
     }
 }
 
-#[cfg(feature = "rust-tls")]
+#[cfg(all(not(feature = "ssl"), feature = "rust-tls"))]
 mod connect_impl {
     use std::marker::PhantomData;