Upgrade mysqlclient-sys dependency to 0.2.5

* update diesel/Cargo.toml
* remove obsolete  windows checks

Co-authored-by: Thomas Constantine Moore <[email protected]>

Author: p-alik

diesel/Cargo.toml

@@ -17,7 +17,7 @@ byteorder = { version = "1.0", optional = true }
 chrono = { version = "0.4.19", optional = true, default-features = false, features = ["clock", "std"] }
 libc = { version = "0.2.0", optional = true }
 libsqlite3-sys = { version = ">=0.17.2, <0.24.0", optional = true, features = ["bundled_bindings"] }
-mysqlclient-sys = { version = "0.2.2", optional = true }
+mysqlclient-sys = { version = "0.2.5", optional = true }
 pq-sys = { version = "0.4.0", optional = true }
 quickcheck = { version = "1.0.3", optional = true }
 serde_json = { version = ">=0.8.0, <2.0", optional = true }

diesel/src/mysql/connection/raw.rs

@@ -48,13 +48,8 @@ impl RawConnection {
         let unix_socket = connection_options.unix_socket();
         let client_flags = connection_options.client_flags();
 
-        #[cfg(not(windows))]
-        // allow single_match because compiler complains about if after cfg
-        // error: attributes are not yet allowed on `if` expressions
-        #[allow(clippy::single_match)]
-        match connection_options.ssl_mode() {
-            Some(ssl_mode) => self.set_ssl_mode(ssl_mode),
-            _ => (),
+        if let Some(ssl_mode) = connection_options.ssl_mode() {
+            self.set_ssl_mode(ssl_mode)
         }
 
         unsafe {
@@ -190,7 +185,6 @@ impl RawConnection {
         self.did_an_error_occur()
     }
 
-    #[cfg(not(windows))]
     fn set_ssl_mode(&self, ssl_mode: mysqlclient_sys::mysql_ssl_mode) {
         let v = ssl_mode as u32;
         let v_ptr: *const u32 = &v;

diesel/src/mysql/connection/url.rs

@@ -8,7 +8,6 @@ use std::ffi::{CStr, CString};
 
 use crate::result::{ConnectionError, ConnectionResult};
 
-#[cfg(not(windows))]
 use mysqlclient_sys::mysql_ssl_mode;
 
 bitflags::bitflags! {
@@ -49,7 +48,6 @@ pub struct ConnectionOptions {
     port: Option<u16>,
     unix_socket: Option<CString>,
     client_flags: CapabilityFlags,
-    #[cfg(not(windows))]
     ssl_mode: Option<mysql_ssl_mode>,
 }
 
@@ -78,7 +76,6 @@ impl ConnectionOptions {
             _ => None,
         };
 
-        #[cfg(not(windows))]
         let ssl_mode = match query_pairs.get("ssl_mode") {
             Some(v) => {
                 let ssl_mode = match v.to_lowercase().as_str() {
@@ -125,7 +122,6 @@ impl ConnectionOptions {
             port: url.port(),
             unix_socket: unix_socket,
             client_flags: client_flags,
-            #[cfg(not(windows))]
             ssl_mode: ssl_mode,
         })
     }
@@ -158,7 +154,6 @@ impl ConnectionOptions {
         self.client_flags
     }
 
-    #[cfg(not(windows))]
     pub fn ssl_mode(&self) -> Option<mysql_ssl_mode> {
         self.ssl_mode
     }
@@ -298,7 +293,6 @@ fn unix_socket_tests() {
     );
 }
 
-#[cfg(not(windows))]
 #[test]
 fn ssl_mode() {
     let ssl_mode = |url| ConnectionOptions::parse(url).unwrap().ssl_mode();