Make features more additive

Try to minimize the extent that features collide
with one another, such that features behave
more additively.

Author: ValuedMammal

src/lib.rs

@@ -24,10 +24,7 @@ extern crate core;
 extern crate log;
 #[cfg(feature = "use-openssl")]
 extern crate openssl;
-#[cfg(all(
-    any(feature = "use-rustls", feature = "use-rustls-ring"),
-    not(feature = "use-openssl")
-))]
+#[cfg(any(feature = "use-rustls", feature = "use-rustls-ring",))]
 extern crate rustls;
 extern crate serde;
 extern crate serde_json;

src/raw_client.rs

@@ -22,10 +22,7 @@ use bitcoin::{Script, Txid};
 #[cfg(feature = "use-openssl")]
 use openssl::ssl::{SslConnector, SslMethod, SslStream, SslVerifyMode};
 
-#[cfg(all(
-    any(feature = "use-rustls", feature = "use-rustls-ring"),
-    not(feature = "use-openssl")
-))]
+#[cfg(any(feature = "use-rustls", feature = "use-rustls-ring"))]
 use rustls::{
     pki_types::ServerName,
     pki_types::{Der, TrustAnchor},
@@ -285,10 +282,7 @@ impl RawClient<ElectrumSslStream> {
     }
 }
 
-#[cfg(all(
-    any(feature = "use-rustls", feature = "use-rustls-ring"),
-    not(feature = "use-openssl")
-))]
+#[cfg(any(feature = "use-rustls", feature = "use-rustls-ring"))]
 mod danger {
     use crate::raw_client::ServerName;
     use rustls::client::danger::{HandshakeSignatureValid, ServerCertVerified};