refactor(ci): consolidate clippy checks into one job (#2695)

* refactor(ci): consolidate clippy checks into one job

---------

Co-authored-by: Boquan Fang <bqfang@amazon.com>
Co-authored-by: Wesley Rosenblum <wesleyr@amazon.com>

Author: 3 people

.github/workflows/ci.yml

@@ -42,6 +42,7 @@ jobs:
       msrv: ${{ steps.definitions.outputs.msrv }}
       examples: ${{ steps.definitions.outputs.examples }}
       crates: ${{ steps.definitions.outputs.crates }}
+      workspaces:  ${{ steps.definitions.outputs.workspaces }}
     steps:
       - uses: actions/checkout@v4
       # examples is populated by
@@ -76,6 +77,9 @@ jobs:
           export CRATES=$(find quic common -name *Cargo.toml | jq -R | jq -s | jq '. += ["tools/xdp/s2n-quic-xdp/Cargo.toml","dc/s2n-quic-dc/Cargo.toml"]' | jq -c)
           echo "crates=$CRATES"
           echo "crates=$CRATES" >> $GITHUB_OUTPUT
+          export WORKSPACES=$(find . -maxdepth 4 -name Cargo.toml -not -path './tools/xdp/ebpf/*' -exec grep -l '^\[workspace\]'  {} \; | xargs -n1 dirname | sort | jq -R | jq -sc)
+          echo "workspaces=$WORKSPACES"
+          echo "workspaces=$WORKSPACES" >> $GITHUB_OUTPUT
 
   rustfmt:
     runs-on: ubuntu-latest
@@ -96,14 +100,7 @@ jobs:
 
   clippy:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - toolchain: stable
-            # fail on stable warnings
-            args: "-D warnings"
-          - toolchain: beta
+    needs: env
     steps:
       - uses: actions/checkout@v4
         with:
@@ -112,15 +109,21 @@ jobs:
       - name: Install rust toolchain
         id: toolchain
         run: |
-          rustup toolchain install ${{ matrix.toolchain }} --profile minimal --component clippy
-          rustup override set ${{ matrix.toolchain }}
+          rustup toolchain install stable --profile minimal --component clippy
+          rustup override set stable
 
       - uses: camshaft/rust-cache@v1
 
       # TODO translate json reports to in-action warnings
-      - name: Run cargo clippy
+      - name: Run cargo clippy on all workspaces
         run: |
-          cargo clippy --all-features --all-targets --workspace -- ${{ matrix.args }}
+          WORKSPACES=$(echo '${{ needs.env.outputs.workspaces }}' | jq -r '.[]')
+          for workspace in $WORKSPACES; do
+            echo "Running clippy on $workspace"
+            cd "$workspace"
+            cargo clippy --all-features --all-targets --workspace -- -D warnings
+            cd $GITHUB_WORKSPACE
+          done
 
   udeps:
     runs-on: ubuntu-latest
@@ -522,10 +525,6 @@ jobs:
         working-directory: ${{ matrix.example }}
         run: cargo +nightly fmt --all -- --check
 
-      - name: lint
-        working-directory: ${{ matrix.example }}
-        run: cargo clippy --all-features --all-targets -- -D warnings
-
       # not all examples will build with the --manifest-path argument, since the
       # manifest-path argument will pull configuration from the current directory
       # instead of the directory with the Cargo.toml file
@@ -884,7 +883,7 @@ jobs:
       - name: Install rust toolchain
         id: toolchain
         run: |
-          rustup toolchain install stable --profile minimal --component clippy,rustfmt
+          rustup toolchain install stable --profile minimal --component rustfmt
           rustup override set stable
 
       - uses: camshaft/install@v1
@@ -893,10 +892,6 @@ jobs:
 
       - uses: camshaft/rust-cache@v1
 
-      - name: Run clippy
-        working-directory: tools/xdp
-        run: cargo +stable clippy
-
       - name: Build ebpf
         working-directory: tools/xdp
         env:
@@ -917,7 +912,7 @@ jobs:
       - name: Install rust toolchain
         working-directory: dc/wireshark
         run: |
-          rustup toolchain install stable --profile minimal --component clippy,rustfmt
+          rustup toolchain install stable --profile minimal --component rustfmt
           rustup override set stable
 
       - uses: camshaft/install@v1
@@ -935,10 +930,6 @@ jobs:
         working-directory: dc/wireshark
         run: cargo fmt --all -- --check
 
-      - name: Run clippy
-        working-directory: dc/wireshark
-        run: cargo clippy --tests
-
       - name: Run tests
         working-directory: dc/wireshark
         run: cargo xtask test

dc/wireshark/.clippy.toml

@@ -1 +1 @@
-msrv = "1.77.0"
+msrv = "1.82.0"

dc/wireshark/Cargo.toml

@@ -3,7 +3,7 @@ name = "wireshark_dcquic"
 version = "0.0.0"
 edition = "2021"
 publish = false
-rust-version = "1.77"
+rust-version = "1.82"
 
 [lib]
 crate-type = ["rlib", "cdylib"]

dc/wireshark/build.rs

@@ -33,6 +33,6 @@ fn env<N: AsRef<str>>(name: N) -> String {
 
 fn option_env<N: AsRef<str>>(name: N) -> Option<String> {
     let name = name.as_ref();
-    println!("cargo:rerun-if-env-changed={}", name);
+    println!("cargo:rerun-if-env-changed={name}");
     std::env::var(name).ok()
 }

dc/wireshark/rust-toolchain

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.77.0"
+channel = "1.82.0"
 components = [ "rustc", "clippy", "rustfmt" ]

dc/wireshark/src/wireshark.rs

@@ -36,7 +36,7 @@ impl Info for Vec<u8> {
 
     fn append<T: core::fmt::Display>(&mut self, v: T) {
         use std::io::Write;
-        let _ = write!(self, "{}", v);
+        let _ = write!(self, "{v}");
     }
 
     fn append_str(&mut self, v: &str) {
@@ -51,7 +51,7 @@ impl Info for String {
 
     fn append<T: core::fmt::Display>(&mut self, v: T) {
         use std::fmt::Write;
-        let _ = write!(self, "{}", v);
+        let _ = write!(self, "{v}");
     }
 
     fn append_str(&mut self, v: &str) {

dc/wireshark/xtask/src/main.rs

@@ -264,7 +264,7 @@ impl WiresharkVersion {
         let tshark = tshark(sh).unwrap();
         let output = cmd!(sh, "{tshark} --version").read().unwrap();
         let version = output.lines().next().unwrap();
-        let version = version.trim_start_matches(|v: char| !v.is_digit(10));
+        let version = version.trim_start_matches(|v: char| !v.is_ascii_digit());
         let (version, _) = version
             .split_once(char::is_whitespace)
             .unwrap_or((version, ""));

tools/udp-attack/Cargo.toml

@@ -3,6 +3,7 @@ name = "udp-attack"
 version = "0.1.0"
 edition = "2021"
 publish = false
+rust-version = "1.82"
 
 [dependencies]
 clap = { version = "4", features = ["derive"] }

tools/udp-attack/rust-toolchain

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.80.0"
+channel = "1.82.0"
 components = [ "rustc", "clippy", "rustfmt" ]