From 6047980109be03aa904648c6782e70c633fc347f Mon Sep 17 00:00:00 2001
From: Alex Stokes <r.alex.stokes@gmail.com>
Date: Sun, 9 Jul 2023 13:35:49 -0600
Subject: [PATCH] Revert "downgrade `clippy` to stable until
 https://github.com/clap-rs/clap/issues/4733 is fixed"

This reverts commit 51e1028361264013252a6da1e9ced67d5a48df89.
---
 .github/workflows/ci.yml | 34 ++++------------------------------
 justfile                 |  3 +--
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5ead7003..2c028a2c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,36 +42,7 @@ jobs:
       - name: Validate config
         run: cargo run config example.config.toml
 
-  # TODO merge `fmt` back in after https://github.com/clap-rs/clap/issues/4733 is fixed
-  # and restore `clippy` to `+nightly`
   lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Read toolchain file
-        id: rust-toolchain
-        run: |
-          RUST_TOOLCHAIN=$(grep 'channel' rust-toolchain.toml | awk '{split($0,a," = "); print a[2]}' | tr -d '"')
-          echo "RUST_TOOLCHAIN=$RUST_TOOLCHAIN" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Install toolchain
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ steps.rust-toolchain.outputs.RUST_TOOLCHAIN }}
-          components: clippy
-
-      - name: Rust cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-
-      - name: Check clippy
-        run: cargo clippy --all-targets --all-features --all --verbose -- -D warnings
-
-  fmt:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
@@ -80,7 +51,7 @@ jobs:
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@nightly
         with:
-          components: rustfmt
+          components: rustfmt, clippy
 
       - name: Rust cache
         uses: Swatinem/rust-cache@v2
@@ -89,3 +60,6 @@ jobs:
 
       - name: Check format
         run: cargo +nightly fmt --all --check
+
+      - name: Check clippy
+        run: cargo +nightly clippy --all-targets --all-features --all --verbose -- -D warnings
diff --git a/justfile b/justfile
index 01d5d878..a8499f89 100644
--- a/justfile
+++ b/justfile
@@ -15,8 +15,7 @@ test:
 fmt:
     cargo +nightly fmt --all
 lint: fmt validate-example-config
-    # TODO restore +nightly after fixing this: https://github.com/clap-rs/clap/issues/4733
-    cargo clippy --all-targets --all-features --all
+    cargo +nightly clippy --all-targets --all-features --all
 build:
     cargo build --all-targets --all-features --all
 run-ci: lint build test run-integration-tests