fix(core): warning in tls_rustls

Author: abonander

sqlx-core/src/net/tls/tls_rustls.rs

@@ -137,10 +137,7 @@ where
                 .with_no_client_auth()
         }
     } else {
-        #[cfg(any(feature = "_tls-rustls-aws-lc-rs", feature = "_tls-rustls-ring-webpki"))]
-        let mut cert_store = certs_from_webpki();
-        #[cfg(feature = "_tls-rustls-ring-native-roots")]
-        let mut cert_store = certs_from_native_store();
+        let mut cert_store = import_root_certs();
 
         if let Some(ca) = tls_config.root_cert_path {
             let data = ca.data().await?;
@@ -211,13 +208,13 @@ fn private_key_from_pem(pem: Vec<u8>) -> Result<PrivateKeyDer<'static>, Error> {
     }
 }
 
-#[cfg(any(feature = "_tls-rustls-aws-lc-rs", feature = "_tls-rustls-ring-webpki"))]
-fn certs_from_webpki() -> RootCertStore {
+#[cfg(all(feature = "webpki-roots", not(feature = "rustls-native-certs")))]
+fn import_root_certs() -> RootCertStore {
     RootCertStore::from_iter(webpki_roots::TLS_SERVER_ROOTS.iter().cloned())
 }
 
-#[cfg(feature = "_tls-rustls-ring-native-roots")]
-fn certs_from_native_store() -> RootCertStore {
+#[cfg(feature = "rustls-native-certs")]
+fn import_root_certs() -> RootCertStore {
     let mut root_cert_store = RootCertStore::empty();
 
     let load_results = rustls_native_certs::load_native_certs();
@@ -233,6 +230,12 @@ fn certs_from_native_store() -> RootCertStore {
     root_cert_store
 }
 
+// Not currently used but allows for a "tls-rustls-no-roots" feature.
+#[cfg(not(any(feature = "rustls-native-certs", feature = "webpki-roots")))]
+fn import_root_certs() -> RootCertStore {
+    RootCertStore::empty()
+}
+
 #[derive(Debug)]
 struct DummyTlsVerifier {
     provider: Arc<CryptoProvider>,