From 214f40bf1b24d4a71f8e4bc8c923b6b4f2d876b3 Mon Sep 17 00:00:00 2001 From: Asuna Date: Wed, 12 Jun 2024 23:53:37 +0800 Subject: [PATCH] CI cargo clippy deny warnings for benches --- .github/workflows/ci.yml | 12 ++++++++---- spdlog/benches/common/mod.rs | 1 + spdlog/benches/spdlog-rs/pattern.rs | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00375b5a..552de298 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,16 +77,20 @@ jobs: - name: Install dependencies if: matrix.os == 'ubuntu-latest' run: sudo bash ./.github/workflows/install-deps.sh - - name: Install Rust nightly + - name: Install Rust nightly (stable date version) run: | - rustup toolchain install nightly - rustup component add clippy --toolchain nightly + STABLE_DATE=$(cargo clippy --version | perl -ne 'print $& if /\b\d{4}-\d{2}-\d{2}\b/') + echo "STABLE_DATE=$STABLE_DATE" >> $GITHUB_ENV + + rustup toolchain install nightly-$STABLE_DATE + rustup component add clippy --toolchain nightly-$STABLE_DATE - name: Restore cargo caches uses: Swatinem/rust-cache@v1 - name: Run clippy run: cargo clippy --all-features --tests --examples -- -D warnings - name: Run clippy nightly for benches - run: cargo +nightly clippy --all-features --benches + run: | + cargo +nightly-${{ env.STABLE_DATE }} clippy --all-features --benches -- -D warnings check: strategy: diff --git a/spdlog/benches/common/mod.rs b/spdlog/benches/common/mod.rs index 306940ef..7a667e1c 100644 --- a/spdlog/benches/common/mod.rs +++ b/spdlog/benches/common/mod.rs @@ -9,6 +9,7 @@ use std::{ use once_cell::sync::Lazy; +#[allow(dead_code)] pub static BENCH_LOGS_PATH: Lazy = Lazy::new(|| { let path = Path::new(env!("OUT_DIR")).join("bench_logs"); if !path.exists() { diff --git a/spdlog/benches/spdlog-rs/pattern.rs b/spdlog/benches/spdlog-rs/pattern.rs index 086ba8a3..aaa58b78 100644 --- a/spdlog/benches/spdlog-rs/pattern.rs +++ b/spdlog/benches/spdlog-rs/pattern.rs @@ -6,7 +6,7 @@ use std::{cell::RefCell, sync::Arc}; use paste::paste; use spdlog::{ - formatter::{pattern, Formatter, FullFormatter, Pattern, PatternFormatter, RuntimePattern}, + formatter::{pattern, Formatter, FullFormatter, Pattern, PatternFormatter}, prelude::*, sink::Sink, Record, StringBuf,