Fix Rust 1.95 CI warnings

Update Rust code for new Clippy lints introduced by the CI toolchain, including Duration unit constructors, loop counter handling, Option checks, and trailing commas.

Stop routine frontend asset downloads from being emitted as Cargo warnings during builds.

Move checkout and rust-cache GitHub Actions to Node 24-compatible releases to avoid runner deprecation warnings.

User-level behavior is unchanged; the only observable change is quieter build logs.

Author: lovasoa

.github/workflows/ci.yml

@@ -24,11 +24,11 @@ jobs:
   compile_and_lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
       - run: npm ci
       - run: npm test
       - name: Set up cargo cache
-        uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
+        uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
         with:
           shared-key: rust-sqlpage-proj-test
           save-if: ${{ github.ref == 'refs/heads/main' }}
@@ -63,9 +63,9 @@ jobs:
             container: oracle
             db_url: "Driver=Oracle 21 ODBC driver;Dbq=//127.0.0.1:1521/FREEPDB1;Uid=root;Pwd=Password123!"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
       - name: Set up cargo cache
-        uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
+        uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
         with:
           shared-key: rust-sqlpage-proj-test
           save-if: false
@@ -98,9 +98,9 @@ jobs:
   windows_test:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
       - name: Set up cargo cache
-        uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
+        uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
       - name: Check port usage
         run: netstat -bano
       - run: cargo test
@@ -130,7 +130,7 @@ jobs:
             variant: duckdb
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.2
       - id: suffix
         name: Cache name suffix
         run: |

.github/workflows/official-site.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cloning repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
       - id: get_gitsha

.github/workflows/playwright.yml

@@ -12,9 +12,9 @@ jobs:
         working-directory: ./tests/end-to-end
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6.0.2
     - name: Set up cargo cache
-      uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
+      uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
     - uses: actions/setup-node@v4
       with:
         node-version: lts/*
@@ -41,4 +41,4 @@ jobs:
       with:
         name: playwright-report
         path: ./tests/end-to-end/playwright-report/
-        retention-days: 30
+        retention-days: 30

.github/workflows/release.yml

@@ -29,13 +29,13 @@ jobs:
             target: x86_64-apple-darwin
             features: "odbc-static"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: ${{ matrix.target }}
       - name: Set up cargo cache
-        uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
+        uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
       - name: Build
         run: cargo build --profile superoptimized --locked --target ${{ matrix.target }} --features "${{ matrix.features }}"
       - name: Upload unsigned Windows artifact
@@ -84,13 +84,13 @@ jobs:
     runs-on: ubuntu-latest
     container: quay.io/pypa/manylinux_2_28_x86_64
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: x86_64-unknown-linux-gnu
       - name: Set up cargo cache
-        uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
+        uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
       - name: Build
         run: cargo build --profile superoptimized --locked --target x86_64-unknown-linux-gnu --features "odbc-static"
       - uses: actions/upload-artifact@v4
@@ -103,7 +103,7 @@ jobs:
     name: Build AWS Lambda Serverless zip image
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
       - run: docker build -t sqlpage-lambda-builder . -f lambda.Dockerfile --target builder
       - run: docker run sqlpage-lambda-builder cat deploy.zip > sqlpage-aws-lambda.zip
       - uses: actions/upload-artifact@v4
@@ -117,7 +117,7 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
       - uses: actions/download-artifact@v4
       - run: |
           rm -rf sqlpage/templates/*.handlebars;
@@ -147,9 +147,9 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
       - name: Set up cargo cache
-        uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
+        uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4
       - run: sudo apt-get update && sudo apt-get install -y unixodbc-dev
       - name: Publish to crates.io
         run: cargo publish --token ${{ secrets.CRATES_IO_TOKEN }}

build.rs

@@ -71,7 +71,6 @@ async fn process_input_file(client: &awc::Client, path_out: &Path, original: Fil
             if std::env::var("DOCS_RS").is_err() {
                 copy_url_to_opened_file(client, url, &mut outfile).await;
             } else {
-                println!("cargo:warning=Skipping download of {url} because we're building docs.");
                 return;
             }
             outfile.write_all(b"\n").unwrap();
@@ -93,7 +92,6 @@ async fn copy_url_to_opened_file(
     // If the file has been downloaded manually, use it
     let cached_file_path = make_url_path(url);
     if !cached_file_path.exists() {
-        println!("cargo:warning=Downloading {url} to cache file {cached_file_path:?}.");
         download_url_to_path(client, url, &cached_file_path).await;
         println!("cargo:rerun-if-changed={}", cached_file_path.display());
     }
@@ -133,7 +131,7 @@ async fn download_url_to_path(client: &awc::Client, url: &str, path: &Path) {
                     );
                 }
                 sleep(Duration::from_secs(1)).await;
-                println!("cargo:warning=Retrying download of {url} after {err}.");
+                eprintln!("Retrying download of {url} after {err}.");
                 attempt += 1;
             }
         }

src/app_config.rs

@@ -94,15 +94,15 @@ impl AppConfig {
             if is_sqlite {
                 None
             } else {
-                Some(Duration::from_secs(30 * 60))
+                Some(Duration::from_mins(30))
             },
         );
         self.database_connection_max_lifetime = resolve_timeout(
             self.database_connection_max_lifetime,
             if is_sqlite {
                 None
             } else {
-                Some(Duration::from_secs(60 * 60))
+                Some(Duration::from_hours(1))
             },
         );
     }

src/webserver/database/error_highlighting.rs

@@ -148,19 +148,17 @@ pub fn highlight_line_offset<W: std::fmt::Write>(msg: &mut W, line: &str, offset
 /// line and `col_num` are 1-based
 pub fn quote_source_with_highlight(source: &str, line_num: u64, col_num: u64) -> String {
     let mut msg = String::new();
-    let mut current_line_num: u64 = 1; // 1-based line number
     let col_num_usize = usize::try_from(col_num)
         .unwrap_or_default()
         .saturating_sub(1);
-    for line in source.lines() {
+    for (current_line_num, line) in (1_u64..).zip(source.lines()) {
         if current_line_num + 1 == line_num || current_line_num == line_num + 1 {
             writeln!(msg, "{line}").unwrap();
         } else if current_line_num == line_num {
             highlight_line_offset(&mut msg, line, col_num_usize);
         } else if current_line_num > line_num + 1 {
             break;
         }
-        current_line_num += 1;
     }
     msg
 }

src/webserver/database/sql.rs

@@ -1116,7 +1116,7 @@ mod test {
                 assert_eq!(query, "SELECT CURRENT_TIMESTAMP AS sqlpage_set_expr");
                 assert!(params.is_empty());
             } else {
-                panic!("Failed for dialect {dialect:?}: {stmt:#?}",);
+                panic!("Failed for dialect {dialect:?}: {stmt:#?}");
             }
         }
     }

src/webserver/http_request_info.rs

@@ -298,11 +298,7 @@ async fn is_file_field_empty(
 ) -> anyhow::Result<bool> {
     Ok(
         uploaded_file.content_type == Some(mime_guess::mime::APPLICATION_OCTET_STREAM)
-            && uploaded_file
-                .file_name
-                .as_ref()
-                .filter(|x| !x.is_empty())
-                .is_none()
+            && uploaded_file.file_name.as_deref().is_none_or(str::is_empty)
             && tokio::fs::metadata(&uploaded_file.file.path()).await?.len() == 0,
     )
 }

src/webserver/oidc.rs

@@ -48,7 +48,7 @@ const SQLPAGE_REDIRECT_URI: &str = "/sqlpage/oidc_callback";
 const SQLPAGE_LOGOUT_URI: &str = "/sqlpage/oidc_logout";
 const SQLPAGE_NONCE_COOKIE_NAME: &str = "sqlpage_oidc_nonce";
 const SQLPAGE_TMP_LOGIN_STATE_COOKIE_PREFIX: &str = "sqlpage_oidc_state_";
-const OIDC_CLIENT_MAX_REFRESH_INTERVAL: Duration = Duration::from_secs(60 * 60);
+const OIDC_CLIENT_MAX_REFRESH_INTERVAL: Duration = Duration::from_hours(1);
 const OIDC_CLIENT_MIN_REFRESH_INTERVAL: Duration = Duration::from_secs(5);
 const OIDC_HTTP_BODY_TIMEOUT: Duration = OIDC_CLIENT_MIN_REFRESH_INTERVAL;
 const SQLPAGE_OIDC_REDIRECT_COUNT_COOKIE: &str = "sqlpage_oidc_redirect_count";
@@ -998,7 +998,7 @@ fn make_oidc_client(
     if needs_http {
         log::debug!("App host seems to be local, changing redirect URL to HTTP");
         redirect_url =
-            RedirectUrl::new(format!("http://{}{}", config.app_host, config.redirect_uri,))?;
+            RedirectUrl::new(format!("http://{}{}", config.app_host, config.redirect_uri))?;
     }
     log::info!("OIDC redirect URL for {}: {redirect_url}", config.client_id);
     let client =