From c6d34ff1e49b14eca7546c9434b98d6a9ad2c8f2 Mon Sep 17 00:00:00 2001
From: Martijn <garm@ilumeo.com>
Date: Mon, 25 Sep 2023 13:46:18 +0200
Subject: [PATCH 1/3] Remove nightly and beta test targets

---
 .github/workflows/test.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 94f96ab2..e9ed9aac 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,23 +25,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build: [stable, beta, nightly, win-gnu, win-msvc]
+        build: [stable, win-gnu, win-msvc]
         include:
           # latest rust stable :: ubuntu
           - build: stable
             os: ubuntu-latest
             rust: stable
 
-          # latest rust beta :: ubuntu
-          - build: beta
-            os: ubuntu-latest
-            rust: beta
-
-          # latest rust nightly :: ubuntu
-          - build: nightly
-            os: ubuntu-latest
-            rust: nightly
-
           # latest rust stable :: windows + gnu
           - build: win-gnu
             os: windows-latest

From 180600ad50996f7527b4b3125c25ec5a86d22e38 Mon Sep 17 00:00:00 2001
From: Martijn <garm@ilumeo.com>
Date: Mon, 25 Sep 2023 13:49:03 +0200
Subject: [PATCH 2/3] Update linter action to use maintained rust toolchain
 setup action

---
 .github/workflows/linter.yml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index d72a08e0..2ca105ba 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -7,30 +7,23 @@ on:
       - main
       - staging # for Bors
       - trying # for Bors
+  merge_group:
 jobs:
   linter:
+    name: linter
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
       - name: checkout_repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: install_rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          override: true
-          profile: minimal
           components: clippy
 
       - name: check_with_clippy_backend_pixels
-        uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-targets --no-default-features --features backend_pixels -- -D warnings
+        run: cargo clippy --all-targets --no-default-features --features backend_pixels -- -D warnings
 
       - name: check_with_clippy_backend_piston_window
-        uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-targets --no-default-features --features backend_piston_window -- -D warnings
+        run: cargo clippy --all-targets --no-default-features --features backend_piston_window -- -D warnings

From f52b44347ca034fa2830e016e3fb41d5fe3d65eb Mon Sep 17 00:00:00 2001
From: Martijn <garm@ilumeo.com>
Date: Mon, 25 Sep 2023 15:38:50 +0200
Subject: [PATCH 3/3] Allow clippy::items-after-test-module

This is used by the parameterized macro.
---
 tests/cli.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/cli.rs b/tests/cli.rs
index fe3e4da2..49beade5 100644
--- a/tests/cli.rs
+++ b/tests/cli.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::items_after_test_module)]
+
 use assert_cmd::Command;
 use common::input;
 use parameterized::{ide, parameterized};