Address Clippy lints and update CI (#315)

* apply clippy lints

* update CI to address MSRV

.github/workflows/cargo-publish.yaml

@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup toolchain
-    - uses: actions-rs/toolchain@v1
+      uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
 

.github/workflows/ci.yml

@@ -6,7 +6,8 @@ jobs:
     name: CI is green
     runs-on: ubuntu-latest
     needs:
-      - cargo-fmt-clippy-and-test-macros-and-cli
+      - cargo-fmt-clippy
+      - test-macros-and-cli
       - test-sqlite
       - test-postgres
       - test-tokio-postgres
@@ -17,35 +18,59 @@ jobs:
     steps:
       - run: exit 0
 
-  cargo-fmt-clippy-and-test-macros-and-cli:
-    name: Cargo fmt/clippy/test-macros-and-cli
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [windows-latest, ubuntu-latest]
-        rust: [stable, nightly, 1.56.0]
+  set-rust-versions:
+    runs-on: ubuntu-latest
+    outputs:
+      versions: ${{ steps.set-versions.outputs.versions }}
+    steps:
+      - name: checkout repo
+        uses: actions/checkout@v2
+      - id: set-versions
+        run: |
+          MSRV=$(grep -oP 'rust-version\s*=\s*"\K[^"]+' ./refinery/Cargo.toml)
+          echo "versions=['stable', 'nightly', '$MSRV']" >> $GITHUB_OUTPUT
+            
+  cargo-fmt-clippy:
+    name: Cargo fmt and clippy
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ matrix.rust }}
+          toolchain: beta
       - run: rustup self update
       - run: rustup component add clippy
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
+      - run: cargo clippy --all-targets --all-features
+
+  test-macros-and-cli:
+    name: test-macros-and-cli
+    needs: set-rust-versions
+    strategy:
+      matrix: 
+        rust: ${{ fromJson(needs.set-rust-versions.outputs.versions) }}
+        os: [windows-latest, ubuntu-latest]
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+      - run: rustup self update
       - run: cd refinery_core && cargo test --all-features -- --test-threads 1
       - run: cd refinery && cargo build --all-features
-      - run: cd refinery_macros && cargo clippy
-      - run: cd refinery_cli && cargo clippy
       - run: cd refinery_macros && cargo test
       - run: cd refinery_cli && cargo test
 
   test-sqlite:
     name: Test Sqlite
+    needs: set-rust-versions
     runs-on: ubuntu-latest
     strategy:
-      matrix:
-        rust: [stable, nightly, 1.65.0]
+      matrix: 
+        rust: ${{ fromJson(needs.set-rust-versions.outputs.versions) }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
@@ -56,10 +81,11 @@ jobs:
 
   test-postgres:
     name: Test postgres
+    needs: set-rust-versions
     runs-on: ubuntu-latest
     strategy:
-      matrix:
-        rust: [stable, nightly, 1.56.0]
+      matrix: 
+        rust: ${{ fromJson(needs.set-rust-versions.outputs.versions) }}
     services:
       postgres:
         image: postgres:9.6.13-alpine
@@ -75,10 +101,11 @@ jobs:
 
   test-tokio-postgres:
     name: Test tokio-postgres
-    runs-on: ubuntu-latest
+    needs: set-rust-versions
     strategy:
-      matrix:
-        rust: [stable, nightly, 1.56.0]
+      matrix: 
+        rust: ${{ fromJson(needs.set-rust-versions.outputs.versions) }}
+    runs-on: ubuntu-latest
     services:
       postgres:
         image: postgres:9.6.13-alpine
@@ -93,10 +120,11 @@ jobs:
 
   test-mysql:
     name: Test mysql
+    needs: set-rust-versions
     runs-on: ubuntu-latest
     strategy:
-      matrix:
-        rust: [stable, nightly, 1.56.0]
+      matrix: 
+        rust: ${{ fromJson(needs.set-rust-versions.outputs.versions) }}
     services:
       postgres:
         image: mysql:latest
@@ -117,10 +145,11 @@ jobs:
 
   test-mysql-async:
     name: Test mysql-async
+    needs: set-rust-versions
     runs-on: ubuntu-latest
     strategy:
-      matrix:
-        rust: [stable, nightly, 1.56.0]
+      matrix: 
+        rust: ${{ fromJson(needs.set-rust-versions.outputs.versions) }}
     services:
       postgres:
         image: mysql:latest
@@ -140,10 +169,11 @@ jobs:
 
   test-tiberius:
     name: Test tiberius
+    needs: set-rust-versions
     runs-on: ubuntu-latest
     strategy:
-      matrix:
-        rust: [stable, nightly, 1.56.0]
+      matrix: 
+        rust: ${{ fromJson(needs.set-rust-versions.outputs.versions) }}
     services:
       mssql:
         image: mcr.microsoft.com/mssql/server:2017-latest

refinery/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "refinery"
 version = "0.8.12"
-rust-version = "1.56"
+rust-version = "1.75"
 authors = ["Katharina Fey <kookie@spacekookie.de>", "João Oliveira <hello@jxs.pt>"]
 license = "MIT"
 description = "Powerful SQL migration toolkit for Rust"

refinery/tests/mysql.rs

@@ -78,7 +78,7 @@ mod mysql {
     where
         T: FnOnce() + std::panic::UnwindSafe,
     {
-        let result = std::panic::catch_unwind(|| test());
+        let result = std::panic::catch_unwind(test);
 
         clean_database();
 
@@ -767,7 +767,7 @@ mod mysql {
         // cli only finds .sql migration files
         run_test(|| {
             Command::new("refinery")
-                .args(&[
+                .args([
                     "migrate",
                     "-c",
                     "tests/mysql_refinery.toml",

refinery/tests/postgres.rs

@@ -82,7 +82,7 @@ mod postgres {
     where
         T: FnOnce() + std::panic::UnwindSafe,
     {
-        let result = std::panic::catch_unwind(|| test());
+        let result = std::panic::catch_unwind(test);
 
         clean_database();
 
@@ -748,7 +748,7 @@ mod postgres {
     fn migrates_from_cli() {
         run_test(|| {
             Command::new("refinery")
-                .args(&[
+                .args([
                     "migrate",
                     "-c",
                     "tests/postgres_refinery.toml",

refinery/tests/rusqlite.rs

@@ -40,7 +40,7 @@ mod rusqlite {
         let filepath = "tests/db.sql";
         File::create(filepath).unwrap();
 
-        let result = std::panic::catch_unwind(|| test());
+        let result = std::panic::catch_unwind(test);
 
         fs::remove_file(filepath).unwrap();
 
@@ -199,7 +199,7 @@ mod rusqlite {
 
         conn.execute(
             "INSERT INTO persons (name, city) VALUES (?, ?)",
-            &["John Legend", "New York"],
+            ["John Legend", "New York"],
         )
         .unwrap();
         let (name, city): (String, String) = conn
@@ -222,7 +222,7 @@ mod rusqlite {
 
         conn.execute(
             "INSERT INTO persons (name, city) VALUES (?, ?)",
-            &["John Legend", "New York"],
+            ["John Legend", "New York"],
         )
         .unwrap();
         let (name, city): (String, String) = conn
@@ -245,7 +245,7 @@ mod rusqlite {
 
         conn.execute(
             "INSERT INTO persons (name, city) VALUES (?, ?)",
-            &["John Legend", "New York"],
+            ["John Legend", "New York"],
         )
         .unwrap();
         let (name, city): (String, String) = conn
@@ -831,7 +831,7 @@ mod rusqlite {
     fn migrates_from_cli() {
         run_test(|| {
             Command::new("refinery")
-                .args(&[
+                .args([
                     "migrate",
                     "-c",
                     "tests/sqlite_refinery.toml",

refinery/tests/tiberius.rs

@@ -1,6 +1,6 @@
 use barrel::backend::MsSql as Sql;
 
-#[cfg(all(feature = "tiberius-config"))]
+#[cfg(feature = "tiberius-config")]
 mod tiberius {
     use assert_cmd::prelude::*;
     use futures::FutureExt;
@@ -16,7 +16,7 @@ mod tiberius {
     use time::OffsetDateTime;
     use tokio_util::compat::TokioAsyncWriteCompatExt;
 
-    const CONFIG: &'static str = "mssql://SA:Passw0rd@localhost:1433/refinery_test?trust_cert=true";
+    const CONFIG: &str = "mssql://SA:Passw0rd@localhost:1433/refinery_test?trust_cert=true";
     const DEFAULT_TABLE_NAME: &str = "refinery_schema_history";
 
     fn get_migrations() -> Vec<Migration> {
@@ -1076,7 +1076,7 @@ mod tiberius {
     async fn migrates_from_cli() {
         run_test(async {
             Command::new("refinery")
-                .args(&[
+                .args([
                     "migrate",
                     "-c",
                     "tests/tiberius_refinery.toml",

refinery_cli/src/migrate.rs

@@ -23,6 +23,7 @@ pub fn handle_migration_command(args: MigrateArgs) -> anyhow::Result<()> {
     Ok(())
 }
 
+#[allow(clippy::too_many_arguments)]
 fn run_migrations(
     config_location: &Path,
     grouped: bool,

refinery_cli/tests/cli.rs

@@ -13,7 +13,7 @@ mod cli {
     fn cli_version() {
         Command::cargo_bin("refinery")
             .unwrap()
-            .args(&["-V"])
+            .args(["-V"])
             .assert()
             .stdout(contains(env!("CARGO_PKG_VERSION")));
     }
@@ -23,7 +23,7 @@ mod cli {
     fn migrate_no_args() {
         Command::cargo_bin("refinery")
             .unwrap()
-            .args(&["migrate"])
+            .args(["migrate"])
             .assert()
             .failure();
     }

refinery_core/src/config.rs

@@ -1,8 +1,7 @@
 use crate::error::Kind;
 use crate::Error;
 use std::convert::TryFrom;
-use std::fs;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::str::FromStr;
 use url::Url;
 
@@ -54,7 +53,7 @@ impl Config {
 
     /// create a new Config instance from a config file located on the file system
     #[cfg(feature = "toml")]
-    pub fn from_file_location<T: AsRef<Path>>(location: T) -> Result<Config, Error> {
+    pub fn from_file_location<T: AsRef<std::path::Path>>(location: T) -> Result<Config, Error> {
         let file = std::fs::read_to_string(&location).map_err(|err| {
             Error::new(
                 Kind::ConfigError(format!("could not open config file, {}", err)),
@@ -86,7 +85,7 @@ impl Config {
                     .unwrap_or(&std::env::current_dir().unwrap())
                     .to_path_buf();
 
-                config_db_dir = fs::canonicalize(config_db_dir).unwrap();
+                config_db_dir = std::fs::canonicalize(config_db_dir).unwrap();
                 config_db_path = config_db_dir.join(&config_db_path)
             }
 
@@ -105,7 +104,7 @@ impl Config {
 
     cfg_if::cfg_if! {
         if #[cfg(feature = "rusqlite")] {
-            pub(crate) fn db_path(&self) -> Option<&Path> {
+            pub(crate) fn db_path(&self) -> Option<&std::path::Path> {
                 self.main.db_path.as_deref()
             }
 
@@ -338,7 +337,7 @@ cfg_if::cfg_if! {
                 if config.main.trust_cert {
                     tconfig.trust_cert();
                 }
-                tconfig.authentication(AuthMethod::sql_server(&user, &pass));
+                tconfig.authentication(AuthMethod::sql_server(user, pass));
 
                 Ok(tconfig)
             }

refinery_core/src/drivers/config.rs

@@ -49,8 +49,10 @@ impl AsyncQuery<Vec<Migration>> for Config {
 }
 // this is written as macro so that we don't have to deal with type signatures
 #[cfg(any(feature = "mysql", feature = "postgres", feature = "rusqlite"))]
+#[allow(clippy::redundant_closure_call)]
 macro_rules! with_connection {
     ($config:ident, $op: expr) => {
+        #[allow(clippy::redundant_closure_call)]
         match $config.db_type() {
             ConfigDbType::Mysql => {
                 cfg_if::cfg_if! {
@@ -101,6 +103,7 @@ macro_rules! with_connection {
 ))]
 macro_rules! with_connection_async {
     ($config: ident, $op: expr) => {
+        #[allow(clippy::redundant_closure_call)]
         match $config.db_type() {
             ConfigDbType::Mysql => {
                 cfg_if::cfg_if! {

refinery_core/src/drivers/tokio_postgres.rs

@@ -39,7 +39,7 @@ impl AsyncTransaction for Client {
         let transaction = self.transaction().await?;
         let mut count = 0;
         for query in queries {
-            transaction.batch_execute(*query).await?;
+            transaction.batch_execute(query).await?;
             count += 1;
         }
         transaction.commit().await?;