From 5730b2f9524640725918b4c1de2a7bd376c2d3ed Mon Sep 17 00:00:00 2001
From: gwenn <gtreguier@gmail.com>
Date: Wed, 16 Jun 2021 19:22:31 +0200
Subject: [PATCH] Fix clippy warnings

---
 libsqlite3-sys/build.rs | 5 ++++-
 src/lib.rs              | 2 +-
 src/pragma.rs           | 4 ++--
 src/row.rs              | 6 +++---
 src/statement.rs        | 2 +-
 src/vtab/csvtab.rs      | 2 +-
 tests/vtab.rs           | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/libsqlite3-sys/build.rs b/libsqlite3-sys/build.rs
index c151a37..fc3ac15 100644
--- a/libsqlite3-sys/build.rs
+++ b/libsqlite3-sys/build.rs
@@ -181,7 +181,10 @@ mod build_bundled {
 
             if cfg!(feature = "bundled-sqlcipher-vendored-openssl") {
                 cfg.include(std::env::var("DEP_OPENSSL_INCLUDE").unwrap());
-                println!("cargo:rustc-link-lib=static=crypto"); // cargo will resolve downstream to the static lib in openssl-sys
+                println!("cargo:rustc-link-lib=static=crypto"); // cargo will
+                                                                // resolve downstream
+                                                                // to the static
+                                                                // lib in openssl-sys
             } else if is_windows {
                 // FIXME README says that bundled-sqlcipher is Unix only, and the sources are
                 // configured on a Unix machine. So maybe this should be made unreachable.
diff --git a/src/lib.rs b/src/lib.rs
index 61dc96f..f1988b3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -670,7 +670,7 @@ impl Connection {
         stmt.check_no_tail()?;
         let mut rows = stmt.query(params)?;
 
-        rows.get_expected_row().map_err(E::from).and_then(|r| f(&r))
+        rows.get_expected_row().map_err(E::from).and_then(|r| f(r))
     }
 
     /// Prepare a SQL statement for execution.
diff --git a/src/pragma.rs b/src/pragma.rs
index 16a6307..2284a8a 100644
--- a/src/pragma.rs
+++ b/src/pragma.rs
@@ -198,7 +198,7 @@ impl Connection {
         let mut rows = stmt.query([])?;
         while let Some(result_row) = rows.next()? {
             let row = result_row;
-            f(&row)?;
+            f(row)?;
         }
         Ok(())
     }
@@ -234,7 +234,7 @@ impl Connection {
         let mut rows = stmt.query([])?;
         while let Some(result_row) = rows.next()? {
             let row = result_row;
-            f(&row)?;
+            f(row)?;
         }
         Ok(())
     }
diff --git a/src/row.rs b/src/row.rs
index e974919..89e6902 100644
--- a/src/row.rs
+++ b/src/row.rs
@@ -156,7 +156,7 @@ where
         self.rows
             .next()
             .transpose()
-            .map(|row_result| row_result.and_then(|row| (map)(&row)))
+            .map(|row_result| row_result.and_then(|row| (map)(row)))
     }
 }
 
@@ -181,7 +181,7 @@ where
         self.rows
             .next()
             .transpose()
-            .map(|row_result| row_result.map_err(E::from).and_then(|row| (map)(&row)))
+            .map(|row_result| row_result.map_err(E::from).and_then(|row| (map)(row)))
     }
 }
 
@@ -210,7 +210,7 @@ impl<'stmt> FallibleStreamingIterator for Rows<'stmt> {
     #[inline]
     fn advance(&mut self) -> Result<()> {
         match self.stmt {
-            Some(ref stmt) => match stmt.step() {
+            Some(stmt) => match stmt.step() {
                 Ok(true) => {
                     self.row = Some(Row { stmt });
                     Ok(())
diff --git a/src/statement.rs b/src/statement.rs
index 139f504..999743f 100644
--- a/src/statement.rs
+++ b/src/statement.rs
@@ -453,7 +453,7 @@ impl Statement<'_> {
     {
         let mut rows = self.query(params)?;
 
-        rows.get_expected_row().and_then(|r| f(&r))
+        rows.get_expected_row().and_then(|r| f(r))
     }
 
     /// Convenience method to execute a query with named parameter(s) that is
diff --git a/src/vtab/csvtab.rs b/src/vtab/csvtab.rs
index 096f272..ca60aeb 100644
--- a/src/vtab/csvtab.rs
+++ b/src/vtab/csvtab.rs
@@ -212,7 +212,7 @@ unsafe impl<'vtab> VTab<'vtab> for CsvTab {
                     if n_col.is_none() && schema.is_none() {
                         cols = headers
                             .into_iter()
-                            .map(|header| escape_double_quote(&header).into_owned())
+                            .map(|header| escape_double_quote(header).into_owned())
                             .collect();
                     }
                 }
diff --git a/tests/vtab.rs b/tests/vtab.rs
index 5c5bdef..fa26459 100644
--- a/tests/vtab.rs
+++ b/tests/vtab.rs
@@ -85,7 +85,7 @@ fn test_dummy_module() -> rusqlite::Result<()> {
 
     let db = Connection::open_in_memory()?;
 
-    db.create_module::<DummyTab>("dummy", &module, None)?;
+    db.create_module::<DummyTab>("dummy", module, None)?;
 
     let version = version_number();
     if version < 3_008_012 {