From 5d148358d64aebd4f6387b7153ed188d2b555e2a Mon Sep 17 00:00:00 2001
From: gwenn <gtreguier@gmail.com>
Date: Fri, 15 Mar 2024 19:23:36 +0100
Subject: [PATCH] Fix clippy warnings

---
 libsqlite3-sys/build.rs | 2 +-
 src/row.rs              | 1 -
 src/types/mod.rs        | 3 +--
 src/vtab/csvtab.rs      | 2 +-
 src/vtab/mod.rs         | 8 ++++----
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/libsqlite3-sys/build.rs b/libsqlite3-sys/build.rs
index 917f0e5..a7bb71e 100644
--- a/libsqlite3-sys/build.rs
+++ b/libsqlite3-sys/build.rs
@@ -487,8 +487,8 @@ mod build_linked {
 }
 
 #[cfg(not(feature = "buildtime_bindgen"))]
+#[allow(dead_code)]
 mod bindings {
-    #![allow(dead_code)]
     use super::HeaderLocation;
 
     use std::path::Path;
diff --git a/src/row.rs b/src/row.rs
index 9295b3d..3f20154 100644
--- a/src/row.rs
+++ b/src/row.rs
@@ -463,7 +463,6 @@ tuples_try_from_row!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P);
 
 #[cfg(test)]
 mod tests {
-    #![allow(clippy::redundant_closure)] // false positives due to lifetime issues; clippy issue #5594
     use crate::{Connection, Result};
 
     #[test]
diff --git a/src/types/mod.rs b/src/types/mod.rs
index 97059a3..74cef3f 100644
--- a/src/types/mod.rs
+++ b/src/types/mod.rs
@@ -385,9 +385,8 @@ mod test {
     }
 
     #[test]
+    #[allow(clippy::float_cmp)]
     fn test_numeric_conversions() -> Result<()> {
-        #![allow(clippy::float_cmp)]
-
         // Test what happens when we store an f32 and retrieve an i32 etc.
         let db = Connection::open_in_memory()?;
         db.execute_batch("CREATE TABLE foo (x)")?;
diff --git a/src/vtab/csvtab.rs b/src/vtab/csvtab.rs
index acf3cd8..2706267 100644
--- a/src/vtab/csvtab.rs
+++ b/src/vtab/csvtab.rs
@@ -115,7 +115,7 @@ unsafe impl<'vtab> VTab<'vtab> for CsvTab {
                     if !Path::new(value).exists() {
                         return Err(Error::ModuleError(format!("file '{value}' does not exist")));
                     }
-                    vtab.filename = value.to_owned();
+                    value.clone_into(&mut vtab.filename);
                 }
                 "schema" => {
                     schema = Some(value.to_owned());
diff --git a/src/vtab/mod.rs b/src/vtab/mod.rs
index 29e7fac..2af2e22 100644
--- a/src/vtab/mod.rs
+++ b/src/vtab/mod.rs
@@ -1080,12 +1080,12 @@ where
     }
 }
 
-unsafe extern "C" fn rust_open<'vtab, T: 'vtab>(
+unsafe extern "C" fn rust_open<'vtab, T>(
     vtab: *mut ffi::sqlite3_vtab,
     pp_cursor: *mut *mut ffi::sqlite3_vtab_cursor,
 ) -> c_int
 where
-    T: VTab<'vtab>,
+    T: VTab<'vtab> + 'vtab,
 {
     let vt = vtab.cast::<T>();
     match (*vt).open() {
@@ -1186,14 +1186,14 @@ where
     }
 }
 
-unsafe extern "C" fn rust_update<'vtab, T: 'vtab>(
+unsafe extern "C" fn rust_update<'vtab, T>(
     vtab: *mut ffi::sqlite3_vtab,
     argc: c_int,
     argv: *mut *mut ffi::sqlite3_value,
     p_rowid: *mut ffi::sqlite3_int64,
 ) -> c_int
 where
-    T: UpdateVTab<'vtab>,
+    T: UpdateVTab<'vtab> + 'vtab,
 {
     assert!(argc >= 1);
     let args = slice::from_raw_parts_mut(argv, argc as usize);