Address clippy warnings and add to gh actions

.github/workflows/sqlx.yml

@@ -14,6 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: cargo fmt --all -- --check
 
+
   check:
     name: Check
     runs-on: ubuntu-22.04
@@ -40,6 +41,25 @@ jobs:
             --no-default-features
             --lib --tests
             --features offline,all-databases,migrate,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
+      - name: Run clippy for core with all features
+        run: |
+          cargo clippy --manifest-path sqlx-core/Cargo.toml \
+            --no-default-features \
+            --features offline,all-databases,all-types,migrate,runtime-${{ matrix.runtime }}-${{ matrix.tls }} \
+            -- -D warnings
+      - name: Run clippy for root with all features
+        run: |
+          cargo clippy \
+            --no-default-features \
+            --features offline,all-databases,all-types,migrate,runtime-${{ matrix.runtime }}-${{ matrix.tls }},macros \
+            -- -D warnings
+      - name: Run clippy for all targets
+        run: |
+          cargo clippy \
+            --no-default-features \
+            --all-targets \
+            --features offline,all-databases,migrate,runtime-${{ matrix.runtime }}-${{ matrix.tls }} \
+            -- -D warnings
 
   test:
     name: Unit Test
@@ -98,6 +118,7 @@ jobs:
           name: cargo-sqlx-${{ matrix.target }}
           path: ${{ matrix.bin }}
 
+
   sqlite:
     name: SQLite
     runs-on: ubuntu-22.04
@@ -110,6 +131,12 @@ jobs:
       - uses: actions/checkout@v4
       - run: mkdir /tmp/sqlite3-lib && wget -O /tmp/sqlite3-lib/ipaddr.so https://github.com/nalgeon/sqlean/releases/download/0.15.2/ipaddr.so
       - uses: Swatinem/rust-cache@v2
+      - name: Run clippy for sqlite
+        run: |
+          cargo clippy \
+            --no-default-features \
+            --features sqlite,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }},macros,migrate \
+            -- -D warnings
       - run:
           cargo test
             --no-default-features
@@ -153,6 +180,15 @@ jobs:
           args: >
             --features postgres,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
 
+      - name: Run clippy for postgres
+        run: |
+          cargo clippy \
+            --no-default-features \
+            --features postgres,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }},macros,migrate \
+            -- -D warnings
+        env:
+          RUSTFLAGS: --cfg postgres_${{ matrix.postgres }}
+
       - run: |
           docker compose -f tests/docker-compose.yml run -d -p 5432:5432 --name postgres_${{ matrix.postgres }} postgres_${{ matrix.postgres }}
           docker exec postgres_${{ matrix.postgres }} bash -c "until pg_isready; do sleep 1; done"
@@ -224,6 +260,13 @@ jobs:
           args: >
             --features mysql,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
 
+      - name: Run clippy for mysql
+        run: |
+          cargo clippy \
+            --no-default-features \
+            --features mysql,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }},macros,migrate \
+            -- -D warnings
+
       - run: docker compose -f tests/docker-compose.yml run -d -p 3306:3306 mysql_${{ matrix.mysql }}
       - run: sleep 60
 
@@ -275,6 +318,13 @@ jobs:
           args: >
             --features mysql,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
 
+      - name: Run clippy for mariadb
+        run: |
+          cargo clippy \
+            --no-default-features \
+            --features mysql,runtime-${{ matrix.runtime }}-${{ matrix.tls }},macros,migrate \
+            -- -D warnings
+
       - run: docker compose -f tests/docker-compose.yml run -d -p 3306:3306 mariadb_${{ matrix.mariadb }}
       - run: sleep 30
 
@@ -315,6 +365,13 @@ jobs:
           args: >
             --features mssql,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
 
+      - name: Run clippy for mssql
+        run: |
+          cargo clippy \
+            --no-default-features \
+            --features mssql,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }},macros,migrate \
+            -- -D warnings
+
       - run: docker compose -f tests/docker-compose.yml run -d -p 1433:1433 mssql_${{ matrix.mssql }}
       - run: sleep 80 # MSSQL takes a "bit" to startup
 

Cargo.toml

@@ -18,6 +18,9 @@ members = [
     "examples/sqlite/todos",
 ]
 
+[workspace.lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(postgres_14)', 'cfg(postgres_9_6)'] }
+
 [package]
 name = "sqlx-oldapi"
 version = "0.6.48"

sqlx-core/src/any/connection/executor.rs

@@ -14,13 +14,13 @@ use futures_util::{StreamExt, TryStreamExt};
 impl<'c> Executor<'c> for &'c mut AnyConnection {
     type Database = Any;
 
-    fn fetch_many<'e, 'q: 'e, E: 'q>(
+    fn fetch_many<'e, 'q: 'e, E>(
         self,
         mut query: E,
     ) -> BoxStream<'e, Result<Either<AnyQueryResult, AnyRow>, Error>>
     where
         'c: 'e,
-        E: Execute<'q, Self::Database>,
+        E: Execute<'q, Self::Database> + 'q,
     {
         let arguments = query.take_arguments();
         let query = query.sql();
@@ -52,13 +52,13 @@ impl<'c> Executor<'c> for &'c mut AnyConnection {
         }
     }
 
-    fn fetch_optional<'e, 'q: 'e, E: 'q>(
+    fn fetch_optional<'e, 'q: 'e, E>(
         self,
         mut query: E,
     ) -> BoxFuture<'e, Result<Option<AnyRow>, Error>>
     where
         'c: 'e,
-        E: Execute<'q, Self::Database>,
+        E: Execute<'q, Self::Database> + 'q,
     {
         let arguments = query.take_arguments();
         let query = query.sql();

sqlx-core/src/any/connection/mod.rs

@@ -35,6 +35,7 @@ pub struct AnyConnection(pub(super) AnyConnectionKind);
 #[derive(Debug)]
 // Used internally in `sqlx-macros`
 #[doc(hidden)]
+#[allow(clippy::large_enum_variant)]
 pub enum AnyConnectionKind {
     #[cfg(feature = "postgres")]
     Postgres(postgres::PgConnection),

sqlx-core/src/any/statement.rs

@@ -33,7 +33,7 @@ impl<'q> Statement<'q> for AnyStatement<'q> {
 
     fn parameters(&self) -> Option<Either<&[AnyTypeInfo], usize>> {
         match &self.parameters {
-            Some(Either::Left(types)) => Some(Either::Left(&types)),
+            Some(Either::Left(types)) => Some(Either::Left(types)),
             Some(Either::Right(count)) => Some(Either::Right(*count)),
             None => None,
         }
@@ -54,7 +54,7 @@ where
         statement
             .column_names
             .get(*self)
+            .copied()
             .ok_or_else(|| Error::ColumnNotFound((*self).into()))
-            .map(|v| *v)
     }
 }

sqlx-core/src/arguments.rs

@@ -29,6 +29,7 @@ pub trait IntoArguments<'q, DB: HasArguments<'q>>: Sized + Send {
 
 // NOTE: required due to lack of lazy normalization
 #[allow(unused_macros)]
+#[allow(clippy::needless_doctest_main)]
 macro_rules! impl_into_arguments_for_arguments {
     ($Arguments:path) => {
         impl<'q>

sqlx-core/src/connection.rs

@@ -119,7 +119,7 @@ pub trait Connection: Send {
     {
         let options = url.parse();
 
-        Box::pin(async move { Ok(Self::connect_with(&options?).await?) })
+        Box::pin(async move { Self::connect_with(&options?).await })
     }
 
     /// Establish a new database connection with the provided options.

sqlx-core/src/executor.rs

@@ -26,25 +26,25 @@ pub trait Executor<'c>: Send + Debug + Sized {
     type Database: Database;
 
     /// Execute the query and return the total number of rows affected.
-    fn execute<'e, 'q: 'e, E: 'q>(
+    fn execute<'e, 'q: 'e, E>(
         self,
         query: E,
     ) -> BoxFuture<'e, Result<<Self::Database as Database>::QueryResult, Error>>
     where
         'c: 'e,
-        E: Execute<'q, Self::Database>,
+        E: Execute<'q, Self::Database> + 'q,
     {
         self.execute_many(query).try_collect().boxed()
     }
 
     /// Execute multiple queries and return the rows affected from each query, in a stream.
-    fn execute_many<'e, 'q: 'e, E: 'q>(
+    fn execute_many<'e, 'q: 'e, E>(
         self,
         query: E,
     ) -> BoxStream<'e, Result<<Self::Database as Database>::QueryResult, Error>>
     where
         'c: 'e,
-        E: Execute<'q, Self::Database>,
+        E: Execute<'q, Self::Database> + 'q,
     {
         self.fetch_many(query)
             .try_filter_map(|step| async move {
@@ -57,13 +57,13 @@ pub trait Executor<'c>: Send + Debug + Sized {
     }
 
     /// Execute the query and return the generated results as a stream.
-    fn fetch<'e, 'q: 'e, E: 'q>(
+    fn fetch<'e, 'q: 'e, E>(
         self,
         query: E,
     ) -> BoxStream<'e, Result<<Self::Database as Database>::Row, Error>>
     where
         'c: 'e,
-        E: Execute<'q, Self::Database>,
+        E: Execute<'q, Self::Database> + 'q,
     {
         self.fetch_many(query)
             .try_filter_map(|step| async move {
@@ -77,7 +77,7 @@ pub trait Executor<'c>: Send + Debug + Sized {
 
     /// Execute multiple queries and return the generated results as a stream
     /// from each query, in a stream.
-    fn fetch_many<'e, 'q: 'e, E: 'q>(
+    fn fetch_many<'e, 'q: 'e, E>(
         self,
         query: E,
     ) -> BoxStream<
@@ -89,28 +89,28 @@ pub trait Executor<'c>: Send + Debug + Sized {
     >
     where
         'c: 'e,
-        E: Execute<'q, Self::Database>;
+        E: Execute<'q, Self::Database> + 'q;
 
     /// Execute the query and return all the generated results, collected into a [`Vec`].
-    fn fetch_all<'e, 'q: 'e, E: 'q>(
+    fn fetch_all<'e, 'q: 'e, E>(
         self,
         query: E,
     ) -> BoxFuture<'e, Result<Vec<<Self::Database as Database>::Row>, Error>>
     where
         'c: 'e,
-        E: Execute<'q, Self::Database>,
+        E: Execute<'q, Self::Database> + 'q,
     {
         self.fetch(query).try_collect().boxed()
     }
 
     /// Execute the query and returns exactly one row.
-    fn fetch_one<'e, 'q: 'e, E: 'q>(
+    fn fetch_one<'e, 'q: 'e, E>(
         self,
         query: E,
     ) -> BoxFuture<'e, Result<<Self::Database as Database>::Row, Error>>
     where
         'c: 'e,
-        E: Execute<'q, Self::Database>,
+        E: Execute<'q, Self::Database> + 'q,
     {
         self.fetch_optional(query)
             .and_then(|row| match row {
@@ -121,13 +121,13 @@ pub trait Executor<'c>: Send + Debug + Sized {
     }
 
     /// Execute the query and returns at most one row.
-    fn fetch_optional<'e, 'q: 'e, E: 'q>(
+    fn fetch_optional<'e, 'q: 'e, E>(
         self,
         query: E,
     ) -> BoxFuture<'e, Result<Option<<Self::Database as Database>::Row>, Error>>
     where
         'c: 'e,
-        E: Execute<'q, Self::Database>;
+        E: Execute<'q, Self::Database> + 'q;
 
     /// Prepare the SQL query to inspect the type information of its parameters
     /// and results.

sqlx-core/src/ext/ustr.rs

@@ -103,6 +103,6 @@ impl serde::Serialize for UStr {
     where
         S: serde::Serializer,
     {
-        serializer.serialize_str(&self)
+        serializer.serialize_str(self)
     }
 }

sqlx-core/src/io/buf.rs

@@ -22,7 +22,7 @@ pub trait BufExt: Buf {
 impl BufExt for Bytes {
     fn get_bytes_nul(&mut self) -> Result<Bytes, Error> {
         let nul =
-            memchr(b'\0', &self).ok_or_else(|| err_protocol!("expected NUL in byte sequence"))?;
+            memchr(b'\0', self).ok_or_else(|| err_protocol!("expected NUL in byte sequence"))?;
 
         let v = self.slice(0..nul);
 
@@ -40,7 +40,7 @@ impl BufExt for Bytes {
 
     fn get_str_nul(&mut self) -> Result<String, Error> {
         self.get_bytes_nul().and_then(|bytes| {
-            from_utf8(&*bytes)
+            from_utf8(&bytes)
                 .map(ToOwned::to_owned)
                 .map_err(|err| err_protocol!("{}", err))
         })

sqlx-core/src/lib.rs

@@ -3,12 +3,8 @@
 #![recursion_limit = "512"]
 #![warn(future_incompatible, rust_2018_idioms)]
 #![allow(clippy::needless_doctest_main, clippy::type_complexity, dead_code)]
-#![deny(
-    clippy::cast_possible_truncation,
-    clippy::cast_possible_wrap,
-    clippy::cast_precision_loss,
-    clippy::cast_sign_loss
-)]
+// Note: Cast warnings are allowed on a case-by-case basis with explicit #[allow(...)]
+// This ensures we're aware of potential issues with numeric conversions
 // See `clippy.toml` at the workspace root
 #![deny(clippy::disallowed_methods)]
 //

sqlx-core/src/logger.rs

@@ -47,7 +47,7 @@ impl<'q> QueryLogger<'q> {
             .to_level()
             .filter(|lvl| log::log_enabled!(target: "sqlx::query", *lvl))
         {
-            let mut summary = parse_query_summary(&self.sql);
+            let mut summary = parse_query_summary(self.sql);
 
             let sql = if summary != self.sql {
                 summary.push_str(" …");
@@ -99,16 +99,11 @@ impl<'q, O: Debug + Hash + Eq, R: Debug, P: Debug> QueryPlanLogger<'q, O, R, P>
     }
 
     pub(crate) fn log_enabled(&self) -> bool {
-        if let Some(_lvl) = self
-            .settings
+        self.settings
             .statements_level
             .to_level()
             .filter(|lvl| log::log_enabled!(target: "sqlx::explain", *lvl))
-        {
-            return true;
-        } else {
-            return false;
-        }
+            .is_some()
     }
 
     pub(crate) fn add_result(&mut self, result: R) {
@@ -126,7 +121,7 @@ impl<'q, O: Debug + Hash + Eq, R: Debug, P: Debug> QueryPlanLogger<'q, O, R, P>
             .to_level()
             .filter(|lvl| log::log_enabled!(target: "sqlx::explain", *lvl))
         {
-            let mut summary = parse_query_summary(&self.sql);
+            let mut summary = parse_query_summary(self.sql);
 
             let sql = if summary != self.sql {
                 summary.push_str(" …");

sqlx-core/src/mssql/arguments.rs

@@ -86,7 +86,7 @@ impl MssqlArguments {
         //  @p1 int, @p2 nvarchar(10), ...
 
         if !declarations.is_empty() {
-            declarations.push_str(",");
+            declarations.push(',');
         }
 
         declarations.push_str(name);

sqlx-core/src/mssql/column.rs

@@ -33,7 +33,7 @@ impl Column for MssqlColumn {
     }
 
     fn name(&self) -> &str {
-        &*self.name
+        &self.name
     }
 
     fn type_info(&self) -> &MssqlTypeInfo {