AI code cleanup: Address clippy warnings and add to gh actions (#31)

* Add clippy checks and suppress doctest warning

Co-authored-by: contact <[email protected]>

* Refactor: Add 'q lifetime bound to Execute trait

This change adds the 'q lifetime bound to the Execute trait in various executor implementations. This ensures that the query parameters live long enough for the query to be executed, preventing potential lifetime issues.

Co-authored-by: contact <[email protected]>

* Refactor: Improve sqlx code quality and fix minor issues

Co-authored-by: contact <[email protected]>

* fix: resolve clippy warnings in pool/inner.rs

- Fix non-binding let on future by spawning close() future
- Replace map_or(false, ...) with is_some_and(...)
- Remove needless borrow in Arc::clone()

* fix: resolve additional clippy warnings

- Fix let_underscore_future by explicitly dropping the future
- Remove unused type parameter DB from deadline_as_timeout function

* fix: resolve clippy warnings in query, io, and tls modules

- Fix reference to reference pattern in query.rs
- Remove redundant closure using and_then directly
- Remove needless borrows in io/buf.rs and logger.rs
- Replace iter().cloned().collect() with to_vec() for better performance
- Use std::io::Error::other() instead of Error::new(ErrorKind::Other)

* fix: resolve more clippy warnings

- Remove reference patterns in query.rs match statements
- Fix unneeded return statements in net/tls/mod.rs
- Remove explicit deref in postgres/column.rs
- Revert redundant closure fix that caused compilation error

* fix: resolve auto-deref and other clippy warnings

- Remove explicit derefs that would be done by auto-deref
- Fix needless borrows in various modules
- Replace is_digit(10) with is_ascii_digit()
- Fix doc list indentation in postgres/copy.rs

* fix: resolve redundant closures and more auto-deref warnings

- Remove redundant closures in lquery and ltree types
- Fix auto-deref issues in postgres options parser
- Fix auto-deref issues in postgres type_info

* fix: apply automatic clippy fixes and resolve type conversion issues

- Fix Cow<str> to Path conversions by using value.as_ref()
- Remove unnecessary mut from variable declaration
- Apply various automatic clippy fixes for redundant code

* fix: resolve remaining simple clippy warnings

- Remove unused mut from variable declaration
- Remove unused lifetime parameter
- Remove legacy numeric constant import
- Simplify boolean expression using De Morgan's law

* fix: resolve large enum variant and naming warnings

- Box the TlsStream variant to reduce enum size
- Rename from_iter methods to avoid confusion with std trait
- Update all pattern matches to handle boxed variant

* Refactor: Improve TLS stream handling and add test script

Co-authored-by: contact <[email protected]>

* Checkpoint before follow-up message

Co-authored-by: contact <[email protected]>

* fix: clippy warnings for mssql, any, postgres, and sqlite modules

- Remove empty line after doc comment in tls_prelogin_stream_wrapper.rs
- Fix needless_borrow in ustr.rs, logger.rs, any/statement.rs
- Fix unneeded_return in logger.rs
- Add allow for large_enum_variant in AnyConnectionKind
- Fix never_loop in postgres time_tz.rs by simplifying DateTime parsing
- Fix module_inception by renaming time module to time_impl
- Fix manual_div_ceil using div_ceil method
- Fix deref which would be done by auto-deref in sqlite/column.rs
- Fix wrong_self_convention by making as_int take &self
- Fix useless_conversion and needless_borrow in sqlite/connection/execute.rs

* fix: more clippy warnings in sqlite and logger modules

- Fix match_like_matches_macro by using is_some() in logger.rs
- Fix needless_borrow warnings in sqlite/connection/execute.rs
- Fix ptr_arg by using slice instead of Vec reference
- Fix clone_on_copy by dereferencing instead of cloning
- Fix needless_return by removing redundant return keyword
- Fix explicit_counter_loop by using enumerate()

* fix: more clippy warnings in sqlite modules

- Fix unused_mut in sqlite/connection/execute.rs
- Fix manual_inspect by using inspect instead of map
- Fix derivable_impls by deriving Default for sqlite option enums
- Fix map_clone by using copied() method
- Fix legacy_numeric_constants by using i32::MAX instead of importing

* fix: clippy warnings for mysql and final sqlite modules

- Fix unnecessary_cast in sqlite/statement/virtual.rs
- Add is_empty() method to MySqlArguments to fix len_without_is_empty
- Fix explicit_auto_deref in mysql/column.rs and mysql/options/parse.rs
- Fix needless_borrows_for_generic_args in mysql/connection/auth.rs
- Fix borrow_deref_ref in mysql/connection/auth.rs
- Fix needless_borrow in mysql/connection/auth.rs and executor.rs
- Remove unused lifetime in mysql/connection/executor.rs
- Fix get_first by using first() instead of get(0)

* fix: more clippy warnings in mysql modules

- Fix explicit_auto_deref in mysql/options/parse.rs and mysql/transaction.rs
- Replace manual Default impl with derive for MySqlSslMode
- Add allow for enum_variant_names in AuthPlugin (breaking change to fix)
- Fix get_first by using first() instead of get(0)
- Fix unnecessary_cast by removing redundant casts
- Fix map_clone by using copied() method in row and statement modules

* fix: clippy warnings in mysql types and migrate modules

- Fix let_and_return in mysql/types/float.rs
- Fix needless_borrows_for_generic_args in chrono and time modules
- Fix len_zero by using is_empty()
- Fix unnecessary_cast by removing redundant type casts
- Fix unwrap_or_default usage
- Fix needless_borrow in json module
- Fix needless_option_as_deref in value module
- Fix get_first by using first() instead of get(0)
- Fix needless_return in migrate module

* fix: clippy warnings in mysql testing and mssql modules

- Fix op_ref by using direct comparison in mysql/migrate.rs
- Fix needless_borrows_for_generic_args in mysql/testing/mod.rs
- Fix drop_non_drop by using let binding instead of drop
- Fix single_char_add_str by using push() with char literal
- Fix explicit_auto_deref in mssql/column.rs and establish.rs
- Fix io_other_error by using std::io::Error::other()
- Fix unnecessary_map_or by using is_some_and()
- Fix unit_arg by using Default::default()
- Add allow for let_unit_value due to platform differences

* fix: more clippy warnings in mssql modules

- Fix unit_arg by using () instead of Default::default()
- Fix redundant_closure by using function reference directly
- Fix while_let_on_iterator by using for loop
- Fix explicit_auto_deref in mssql/options/parse.rs
- Add allow for result_large_err in requested_packet_size
- Fix needless_range_loop by iterating over slice directly
- Add allow for ptr_arg where Vec-specific methods are used

* fix: final clippy warnings in mssql modules

- Fix unused_mut in mssql/io/buf_mut.rs
- Fix useless_conversion by removing redundant .into()
- Fix manual_div_ceil by using div_ceil method

* fix: platform-specific return type for async-std in tls_prelogin_stream_wrapper

- Return 0 for async-std and () for tokio in poll_read
- Fixes compilation with runtime-async-std-rustls feature

* Refactor: Remove unused blank lines and reorder imports

Co-authored-by: contact <[email protected]>

* fix: clippy warnings in tests and macros

- Fix deprecated chrono DateTime::from_utc usage
- Add workspace lint config to allow postgres_14 cfg
- Fix dead code warnings in sqlx-macros query data
- Fix needless_borrows_for_generic_args in sqlx-macros
- Fix useless_conversion by removing redundant .into()
- Fix useless_vec by using array instead of vec! in test

* cargo fmt

* fix: update type annotations for DateTime in MySQL tests

- Change DateTime::from_naive_utc_and_offset to DateTime::<Utc>::from_naive_utc_and_offset in chrono tests

* refactor: remove unused custom domain type and update imports in tests

- Removed the unused RangeInclusive struct from derives.rs
- Added #[allow(unused_imports)] to macros.rs and types.rs to suppress warnings

* fix: correct error handling in native-tls downgrade message

* refactor: streamline clippy checks in CI workflow

- Removed clippy job and integrated checks into existing jobs for core, root, and all targets.
- Added clippy checks for sqlite, postgres, mysql, mariadb, and mssql with specific features.
- Enhanced CI workflow efficiency by consolidating clippy steps.

* fix: update lint configurations and suppress unused import warnings in tests

- Added 'cfg(postgres_9_6)' to the lint configuration in Cargo.toml.
- Suppressed unused import warnings in various test files for better clarity and maintainability.
- Adjusted assertions in MySQL tests for boolean values to use assert! macro.

* fmt

* chore: add unused import suppressions in test files

- Included additional imports for Executor and Row in pool.rs and types.rs respectively.
- Suppressed unused import warnings to enhance code clarity.

* refactor: remove test_all_features.sh script and suppress unused import warnings

- Deleted the test_all_features.sh script to streamline the testing process.
- Added unused import suppressions in test_attr.rs and mssql.rs for improved code clarity.

* refactor: rename from_label_iter to from_iter for consistency

- Renamed the method from_label_iter to from_iter in PgLTree to align with naming conventions and improve clarity.

---------

Co-authored-by: Cursor Agent <[email protected]>

Author: lovasoa

.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))
         })