Improve rustls feature logic

Features are additive, as downstream dependencies can always add features Adjust logic so that priority is nativetls > aws-rs-lc > ring
ClickHouse · Sep 4, 2024 · d4ab7d9 · d4ab7d9
1 parent 5972f7e
commit d4ab7d9
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -93,22 +93,19 @@ impl Default for Client {
         ))]
         connector.enforce_http(false);
 
-        #[cfg(all(
-            feature = "native-tls",
-            not(feature = "rustls-tls"),
-            not(feature = "rustls-tls-aws")
-        ))]
+        #[cfg(feature = "native-tls")]
         let connector = hyper_tls::HttpsConnector::new_with_connector(connector);
 
-        #[cfg(all(feature = "rustls-tls", not(feature = "rustls-tls-aws")))]
-        let connector =
-            prepare_hyper_rustls_connector(connector, rustls::crypto::ring::default_provider());
-        #[cfg(all(feature = "rustls-tls-aws", not(feature = "rustls-tls")))]
+        #[cfg(all(feature = "rustls-tls-aws", not(feature = "native-tls")))]
         let connector = prepare_hyper_rustls_connector(
             connector,
             rustls::crypto::aws_lc_rs::default_provider(),
         );
 
+        #[cfg(all(feature = "rustls-tls", not(feature = "rustls-tls-aws"), not(feature = "native-tls")))]
+        let connector =
+            prepare_hyper_rustls_connector(connector, rustls::crypto::ring::default_provider());
+
         let client = HyperClient::builder(TokioExecutor::new())
             .pool_idle_timeout(POOL_IDLE_TIMEOUT)
             .build(connector);