From a52698b6bfcf8133ec175362090743c486dcfe7a Mon Sep 17 00:00:00 2001 From: Matthew Jackson <1085847+MattJackson@users.noreply.github.com> Date: Mon, 31 Aug 2026 11:06:35 -0700 Subject: [PATCH] chore(msrv): floor to 1.88, pin CI on the floor, allow uninlined_format_args Declared rust-version and the ci.yml/qa.yml toolchain pins both sit at 1.88 (the edition-2024 floor once zip 8 and let-chains are accounted for), so CI builds on exactly the MSRV: an accidental bump to a newer toolchain fails CI by design and moving the floor takes a deliberate pin edit. The uninlined_format_args allow reconciles 1.88's clippy with the allow-by-default it became in 1.97+. --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/qa.yml | 6 +++--- Cargo.toml | 5 ++++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 278497c..5f1ff4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,7 +89,7 @@ jobs: [patch.crates-io] libfreemkv = { path = "../libfreemkv" } EOF - - uses: dtolnay/rust-toolchain@1.97.0 + - uses: dtolnay/rust-toolchain@1.88.0 with: components: clippy, rustfmt - uses: Swatinem/rust-cache@v2 @@ -126,7 +126,7 @@ jobs: [patch.crates-io] libfreemkv = { path = "../libfreemkv" } EOF - - uses: dtolnay/rust-toolchain@1.97.0 + - uses: dtolnay/rust-toolchain@1.88.0 - uses: Swatinem/rust-cache@v2 with: workspaces: freemkv-keysources @@ -174,7 +174,7 @@ jobs: [patch.crates-io] libfreemkv = { path = "../libfreemkv" } EOF - - uses: dtolnay/rust-toolchain@1.97.0 + - uses: dtolnay/rust-toolchain@1.88.0 - uses: Swatinem/rust-cache@v2 with: workspaces: freemkv-keysources @@ -212,7 +212,7 @@ jobs: [patch.crates-io] libfreemkv = { path = "../libfreemkv" } EOF - - uses: dtolnay/rust-toolchain@1.97.0 + - uses: dtolnay/rust-toolchain@1.88.0 with: components: llvm-tools-preview - uses: Swatinem/rust-cache@v2 @@ -266,7 +266,7 @@ jobs: [patch.crates-io] libfreemkv = { path = "../libfreemkv" } EOF - - uses: dtolnay/rust-toolchain@1.97.0 + - uses: dtolnay/rust-toolchain@1.88.0 - uses: Swatinem/rust-cache@v2 with: workspaces: freemkv-keysources diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 6679620..0ee8201 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -93,7 +93,7 @@ jobs: [patch.crates-io] libfreemkv = { path = "../libfreemkv" } EOF - - uses: dtolnay/rust-toolchain@1.97.0 + - uses: dtolnay/rust-toolchain@1.88.0 - uses: Swatinem/rust-cache@v2 with: workspaces: freemkv-keysources @@ -128,7 +128,7 @@ jobs: [patch.crates-io] libfreemkv = { path = "../libfreemkv" } EOF - - uses: dtolnay/rust-toolchain@1.97.0 + - uses: dtolnay/rust-toolchain@1.88.0 with: components: clippy - uses: Swatinem/rust-cache@v2 @@ -167,7 +167,7 @@ jobs: [patch.crates-io] libfreemkv = { path = "../libfreemkv" } EOF - - uses: dtolnay/rust-toolchain@1.97.0 + - uses: dtolnay/rust-toolchain@1.88.0 - uses: Swatinem/rust-cache@v2 with: workspaces: freemkv-keysources diff --git a/Cargo.toml b/Cargo.toml index 4bf6bc7..c0eca63 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "freemkv-keysources" version = "1.6.13" edition = "2024" -rust-version = "1.97" +rust-version = "1.88" license = "MIT" description = "Pluggable AACS key sources (keydb, online key service) for libfreemkv. Each source looks a disc up and hands libfreemkv its terminal Unit Keys via get_unit_keys; the library does all derivation." repository = "https://github.com/freemkv/freemkv-keysources" @@ -41,3 +41,6 @@ codegen-units = 1 # config-level [patch.crates-io] wins over this manifest one for the same crate). [patch.crates-io] libfreemkv = { git = "https://github.com/freemkv/libfreemkv", tag = "v1.6.12" } + +[lints.clippy] +uninlined_format_args = "allow"