refactor: remove irrefutable let lints

Author: mingley

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

@@ -42,17 +42,21 @@ impl<S: Socket> Socket for NativeTlsSocket<S> {
 
 impl TlsConfig<'_> {
     async fn native_tls_connector(&self) -> crate::Result<(native_tls::TlsConnector, &str), Error> {
-        #[allow(irrefutable_let_patterns)]
-        let TlsConfig::RawTlsConfig(RawTlsConfig {
+        let RawTlsConfig {
             root_cert,
             client_cert,
             client_key,
             accept_invalid_certs,
             accept_invalid_hostnames,
             hostname,
-        }) = self
-        else {
-            unreachable!()
+        } = match self {
+            TlsConfig::RawTlsConfig(raw) => raw,
+            #[cfg(feature = "_tls-rustls")]
+            TlsConfig::PrebuiltRustls { .. } => {
+                return Err(Error::Configuration(
+                    "prebuilt rustls config requires the rustls TLS backend".into(),
+                ))
+            }
         };
 
         let mut builder = native_tls::TlsConnector::builder();

sqlx-mysql/src/options/mod.rs

@@ -126,6 +126,26 @@ impl MySqlConnectOptions {
         }
     }
 
+    fn mysql_ssl_config_mut(&mut self) -> &mut MySqlSslConfig {
+        #[cfg(feature = "rustls")]
+        {
+            if matches!(self.ssl_config, SslConfig::Rustls(_)) {
+                self.ssl_config = SslConfig::MySql(MySqlSslConfig::default());
+            }
+
+            match &mut self.ssl_config {
+                SslConfig::MySql(config) => config,
+                SslConfig::Rustls(_) => unreachable!("just set to MySql"),
+            }
+        }
+
+        #[cfg(not(feature = "rustls"))]
+        {
+            let SslConfig::MySql(config) = &mut self.ssl_config;
+            config
+        }
+    }
+
     /// Sets the name of the host to connect to.
     ///
     /// The default behavior when the host is not specified,
@@ -200,15 +220,7 @@ impl MySqlConnectOptions {
     /// ```
     pub fn ssl_ca(mut self, file_name: impl AsRef<Path>) -> Self {
         let cert = Some(CertificateInput::File(file_name.as_ref().to_owned()));
-        #[allow(irrefutable_let_patterns)]
-        if let SslConfig::MySql(c) = &mut self.ssl_config {
-            c.root_cert = cert;
-        } else {
-            self.ssl_config = SslConfig::MySql(MySqlSslConfig {
-                root_cert: cert,
-                ..Default::default()
-            });
-        }
+        self.mysql_ssl_config_mut().root_cert = cert;
         self
     }
 
@@ -224,15 +236,7 @@ impl MySqlConnectOptions {
     /// ```
     pub fn ssl_ca_from_pem(mut self, pem_certificate: Vec<u8>) -> Self {
         let cert = Some(CertificateInput::Inline(pem_certificate));
-        #[allow(irrefutable_let_patterns)]
-        if let SslConfig::MySql(c) = &mut self.ssl_config {
-            c.root_cert = cert;
-        } else {
-            self.ssl_config = SslConfig::MySql(MySqlSslConfig {
-                root_cert: cert,
-                ..Default::default()
-            });
-        }
+        self.mysql_ssl_config_mut().root_cert = cert;
         self
     }
 
@@ -248,15 +252,7 @@ impl MySqlConnectOptions {
     /// ```
     pub fn ssl_client_cert(mut self, cert: impl AsRef<Path>) -> Self {
         let cert = Some(CertificateInput::File(cert.as_ref().to_path_buf()));
-        #[allow(irrefutable_let_patterns)]
-        if let SslConfig::MySql(c) = &mut self.ssl_config {
-            c.client_cert = cert;
-        } else {
-            self.ssl_config = SslConfig::MySql(MySqlSslConfig {
-                client_cert: cert,
-                ..Default::default()
-            });
-        }
+        self.mysql_ssl_config_mut().client_cert = cert;
         self
     }
 
@@ -282,15 +278,7 @@ impl MySqlConnectOptions {
     /// ```
     pub fn ssl_client_cert_from_pem(mut self, cert: impl AsRef<[u8]>) -> Self {
         let cert = Some(CertificateInput::Inline(cert.as_ref().to_vec()));
-        #[allow(irrefutable_let_patterns)]
-        if let SslConfig::MySql(c) = &mut self.ssl_config {
-            c.client_cert = cert;
-        } else {
-            self.ssl_config = SslConfig::MySql(MySqlSslConfig {
-                client_cert: cert,
-                ..Default::default()
-            });
-        }
+        self.mysql_ssl_config_mut().client_cert = cert;
         self
     }
 
@@ -306,15 +294,7 @@ impl MySqlConnectOptions {
     /// ```
     pub fn ssl_client_key(mut self, key: impl AsRef<Path>) -> Self {
         let key = Some(CertificateInput::File(key.as_ref().to_path_buf()));
-        #[allow(irrefutable_let_patterns)]
-        if let SslConfig::MySql(c) = &mut self.ssl_config {
-            c.client_key = key;
-        } else {
-            self.ssl_config = SslConfig::MySql(MySqlSslConfig {
-                client_key: key,
-                ..Default::default()
-            });
-        }
+        self.mysql_ssl_config_mut().client_key = key;
         self
     }
 
@@ -340,15 +320,7 @@ impl MySqlConnectOptions {
     /// ```
     pub fn ssl_client_key_from_pem(mut self, key: impl AsRef<[u8]>) -> Self {
         let key = Some(CertificateInput::Inline(key.as_ref().to_vec()));
-        #[allow(irrefutable_let_patterns)]
-        if let SslConfig::MySql(c) = &mut self.ssl_config {
-            c.client_key = key;
-        } else {
-            self.ssl_config = SslConfig::MySql(MySqlSslConfig {
-                client_key: key,
-                ..Default::default()
-            });
-        }
+        self.mysql_ssl_config_mut().client_key = key;
         self
     }
 

sqlx-mysql/src/options/parse.rs

@@ -112,13 +112,38 @@ impl MySqlConnectOptions {
         };
         url.query_pairs_mut().append_pair("ssl-mode", ssl_mode);
 
-        #[allow(irrefutable_let_patterns)]
-        if let SslConfig::MySql(MySqlSslConfig {
-            root_cert,
-            client_cert,
-            client_key,
-        }) = &self.ssl_config
+        #[cfg(feature = "rustls")]
+        match &self.ssl_config {
+            SslConfig::MySql(MySqlSslConfig {
+                root_cert,
+                client_cert,
+                client_key,
+            }) => {
+                if let Some(root_cert) = root_cert {
+                    url.query_pairs_mut()
+                        .append_pair("ssl-ca", &root_cert.to_string());
+                }
+                if let Some(client_cert) = client_cert {
+                    url.query_pairs_mut()
+                        .append_pair("ssl-cert", &client_cert.to_string());
+                }
+
+                if let Some(client_key) = client_key {
+                    url.query_pairs_mut()
+                        .append_pair("ssl-key", &client_key.to_string());
+                }
+            }
+            SslConfig::Rustls(_) => {}
+        }
+
+        #[cfg(not(feature = "rustls"))]
         {
+            let SslConfig::MySql(MySqlSslConfig {
+                root_cert,
+                client_cert,
+                client_key,
+            }) = &self.ssl_config;
+
             if let Some(root_cert) = root_cert {
                 url.query_pairs_mut()
                     .append_pair("ssl-ca", &root_cert.to_string());