From f9d01a34d782c19541aa9e400d79570d3d86c86c Mon Sep 17 00:00:00 2001 From: Gabriel Comte Date: Mon, 30 Mar 2026 09:38:45 +0200 Subject: [PATCH 1/2] Update CI: replace archived actions, enforce clippy warnings, pin linelint - Replace actions-rs/toolchain (archived) with dtolnay/rust-toolchain - Update actions/checkout from v2/v3 to v4 - Add -D warnings to clippy so warnings fail the build - Pin fernandrone/linelint to v0.4.0 instead of @master --- .github/workflows/build.yml | 7 ++---- .github/workflows/code-analysis.yml | 33 ++++++++++------------------- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59663da..1711790 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,11 +16,8 @@ jobs: name: Build and Test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: rust-toolchain - uses: actions-rs/toolchain@v1.0.6 - with: - toolchain: stable + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable - name: Build run: cargo build --verbose - name: Run unit tests diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml index eba288a..a6860e9 100644 --- a/.github/workflows/code-analysis.yml +++ b/.github/workflows/code-analysis.yml @@ -13,11 +13,8 @@ jobs: name: Security audit runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: rust-toolchain - uses: actions-rs/toolchain@v1.0.6 - with: - toolchain: stable + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable - name: Install security audit run: cargo install cargo-audit - name: Run security audit @@ -26,11 +23,9 @@ jobs: name: Check code formatting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: rust-toolchain - uses: actions-rs/toolchain@v1.0.6 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable with: - toolchain: stable components: rustfmt - name: Check code formatting run: cargo fmt --check --all @@ -38,33 +33,27 @@ jobs: name: Clippy check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: rust-toolchain - uses: actions-rs/toolchain@v1.0.6 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable with: - toolchain: stable components: clippy - name: Clippy - run: cargo clippy --all-targets + run: cargo clippy --all-targets -- -D warnings linelint: name: Check that files end with line break runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Linelint - uses: fernandrone/linelint@master + uses: fernandrone/linelint@0.4.0 id: linelint unused_dependencies: name: Look for unused dependencies runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: rust-toolchain - uses: actions-rs/toolchain@v1.0.6 - with: - toolchain: nightly - override: true + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@nightly - name: Install unused dependency checker run: cargo install cargo-udeps - name: Run unused dependency checker From dffb107be9e1ffeea362d103828978223ad34d5c Mon Sep 17 00:00:00 2001 From: Gabriel Comte Date: Mon, 30 Mar 2026 09:45:45 +0200 Subject: [PATCH 2/2] Fix CI failures: correct linelint tag and resolve clippy warnings - Pin linelint to @0.0.6 (tag 0.4.0 does not exist) - Remove useless format!() in int_tests.rs - Remove unnecessary .to_string() in debug!() macro in defaults.rs --- .github/workflows/code-analysis.yml | 2 +- src/defaults.rs | 2 +- tests/int_tests.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml index a6860e9..5f3e37e 100644 --- a/.github/workflows/code-analysis.yml +++ b/.github/workflows/code-analysis.yml @@ -46,7 +46,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Linelint - uses: fernandrone/linelint@0.4.0 + uses: fernandrone/linelint@0.0.6 id: linelint unused_dependencies: name: Look for unused dependencies diff --git a/src/defaults.rs b/src/defaults.rs index 0cd4071..29140ba 100644 --- a/src/defaults.rs +++ b/src/defaults.rs @@ -54,7 +54,7 @@ impl Defaults { "Reading contents of file {} --> input amount: {}, input currency: {}, output currencies: [{}]", config.path().display(), defaults.amount, - defaults.input_currency.to_string(), + defaults.input_currency, defaults .output_currencies .iter() diff --git a/tests/int_tests.rs b/tests/int_tests.rs index f3db6b6..e71967a 100644 --- a/tests/int_tests.rs +++ b/tests/int_tests.rs @@ -71,7 +71,7 @@ fn test_amount_input_validation() { let si_suffix = "1M"; cmd.args(vec![&si_suffix, "SAT", "BTC"]) .assert() - .stdout(format!("0.01 BTC\n")); + .stdout("0.01 BTC\n".to_string()); // Allow using floating point numbers let mut cmd = cargo::cargo_bin_cmd!("bitcoinvert");