chore: clippy

kumavale · Dec 31, 2024 · eac4620 · eac4620
1 parent e2f5587
commit eac4620
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/concatsql/src/row.rs b/concatsql/src/row.rs
@@ -239,6 +239,7 @@ from_sql_impl! {
     std::num::NonZeroI16,
     std::num::NonZeroI32,
     std::num::NonZeroI64,
+    std::num::NonZeroI128,
     std::num::NonZeroIsize,
     std::num::NonZeroU8,
     std::num::NonZeroU16,
@@ -250,9 +251,6 @@ from_sql_impl! {
     String,
 }
 
-#[cfg(feature = "uuid")]
-from_sql_impl! { std::num::NonZeroI128 }
-
 impl FromSql for Vec<u8> {
     #[doc(hidden)]
     fn from_sql(s: &str) -> Result<Self, Error> {
@@ -284,7 +282,7 @@ mod tests {
     }
 
     #[test]
-    #[allow(clippy::needless_borrow)]
+    #[allow(clippy::needless_borrow, clippy::needless_borrows_for_generic_args)]
     fn row() {
         let mut row = Row::new(["key1","key2","key3","ABC"].iter().map(ToString::to_string).collect());
         row.insert("key1", Some("value".to_string()));
@@ -353,9 +351,11 @@ mod tests {
 
         assert!(!row.is_empty());
 
+        assert_eq!(row.get("key1"), Some("value"));
         assert_eq!(row.get(&"key1"), Some("value"));
         assert_eq!(row.get(&&&&&&&&"key1"), Some("value"));
         assert_eq!(row.get(&*String::from("key1")), Some("value"));
+        assert_eq!(row.get(0), Some("value"));
         assert_eq!(row.get(&0), Some("value"));
         assert_eq!(row.get(String::from("key1")), Some("value"));
         assert_eq!(row.get(&String::from("key1")), Some("value"));

diff --git a/concatsql/src/sqlite/connection.rs b/concatsql/src/sqlite/connection.rs
@@ -318,7 +318,7 @@ unsafe fn bind_all(stmt: *mut ffi::sqlite3_stmt, params: &[Value<'_>], error_lev
                     index,
                     value.as_ptr() as *const _,
                     value.len() as i32,
-                    Some(std::mem::transmute(ffi::SQLITE_TRANSIENT as *const c_void)),
+                    Some(std::mem::transmute::<*const c_void, extern "C" fn(*mut c_void)>(ffi::SQLITE_TRANSIENT as *const c_void)),
                 )
             }
             Value::Bytes(value) => {
@@ -327,7 +327,7 @@ unsafe fn bind_all(stmt: *mut ffi::sqlite3_stmt, params: &[Value<'_>], error_lev
                     index,
                     value.as_ptr() as *const _,
                     value.len() as i32,
-                    Some(std::mem::transmute(ffi::SQLITE_TRANSIENT as *const c_void)),
+                    Some(std::mem::transmute::<*const c_void, extern "C" fn(*mut c_void)>(ffi::SQLITE_TRANSIENT as *const c_void)),
                 )
             }
             Value::IpAddr(value) => {
@@ -337,7 +337,7 @@ unsafe fn bind_all(stmt: *mut ffi::sqlite3_stmt, params: &[Value<'_>], error_lev
                     index,
                     value.as_ptr() as *const _,
                     value.len() as i32,
-                    Some(std::mem::transmute(ffi::SQLITE_TRANSIENT as *const c_void)),
+                    Some(std::mem::transmute::<*const c_void, extern "C" fn(*mut c_void)>(ffi::SQLITE_TRANSIENT as *const c_void)),
                 )
             }
             Value::Time(value) => {
@@ -347,7 +347,7 @@ unsafe fn bind_all(stmt: *mut ffi::sqlite3_stmt, params: &[Value<'_>], error_lev
                     index,
                     value.as_ptr() as *const _,
                     value.len() as i32,
-                    Some(std::mem::transmute(ffi::SQLITE_TRANSIENT as *const c_void)),
+                    Some(std::mem::transmute::<*const c_void, extern "C" fn(*mut c_void)>(ffi::SQLITE_TRANSIENT as *const c_void)),
                 )
             }
         };

diff --git a/concatsql/tests/mysql.rs b/concatsql/tests/mysql.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::never_loop)]
+
 #[cfg(feature = "mysql")]
 #[cfg(debug_assertions)]
 mod mysql {

diff --git a/concatsql/tests/postgres.rs b/concatsql/tests/postgres.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::never_loop)]
+
 #[cfg(feature = "postgres")]
 #[cfg(debug_assertions)]
 mod postgres {

diff --git a/concatsql/tests/sqlite.rs b/concatsql/tests/sqlite.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::never_loop)]
 
 #[cfg(feature = "sqlite")]
 #[cfg(debug_assertions)]
@@ -628,6 +629,7 @@ mod anti_patterns {
         }
 
         let sql = prep!("SELECT age FROM users WHERE name < ") + u32::MIN;
+        #[allow(clippy::never_loop)]
         for _ in conn.rows(&sql).unwrap() {
             unreachable!();
         }