berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

fix features conflict

This commit is contained in:
Marat Safin 2019-07-21 14:26:32 +03:00
parent 4fbbe38da8
commit e52f7152c7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actix-http/src/client/connector.rs
View File

@ -19,11 +19,11 @@ use super::Connect;
#[cfg(feature = "ssl")] #[cfg(feature = "ssl")]
use openssl::ssl::SslConnector; use openssl::ssl::SslConnector;
#[cfg(feature = "rust-tls")] #[cfg(all(not(feature = "ssl"), feature = "rust-tls"))]
use rustls::{Session, ClientConfig}; use rustls::{Session, ClientConfig};
#[cfg(feature = "rust-tls")] #[cfg(all(not(feature = "ssl"), feature = "rust-tls"))]
use std::sync::Arc; use std::sync::Arc;
#[cfg(feature = "rust-tls")] #[cfg(all(not(feature = "ssl"), feature = "rust-tls"))]
type SslConnector = Arc<ClientConfig>; type SslConnector = Arc<ClientConfig>;
#[cfg(all(not(feature = "ssl"), not(feature = "rust-tls")))] #[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)); .map_err(|e| error!("Can not set alpn protocol: {:?}", e));
ssl.build() 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 protos = vec![b"h2".to_vec(), b"http/1.1".to_vec()];
let mut config = ClientConfig::new(); 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"; const H2: &[u8] = b"h2";
use actix_connect::ssl::RustlsConnector; 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 { mod connect_impl {
use std::marker::PhantomData; use std::marker::PhantomData;