Merge remote-tracking branch 'origin/better-macro-must-use' into lint…

…s-table

.github/workflows/local-development-makefile.yaml

@@ -21,7 +21,7 @@ jobs:
 
         target_triple:
           - x86_64-pc-windows-msvc
-          - aarch64-pc-windows-msvc
+          # - aarch64-pc-windows-msvc FIXME: find a way to validate the local makefile on aarch64
 
     steps:
       - name: Checkout Repository
@@ -38,9 +38,22 @@ jobs:
             winget install --disable-interactivity --source winget --exact --id ${{ matrix.wdk }}
           }
 
-      - name: Install Rust Toolchain (${{ matrix.target_triple }})
-        uses: dtolnay/rust-toolchain@stable # Use stable since local makefile pins toolchain versions anyways
+      - name: Install Nightly Rust Toolchain (${{ matrix.target_triple }})
+        uses: dtolnay/rust-toolchain@nightly
         with:
+          components: clippy, rustfmt
+          targets: ${{ matrix.target_triple }}
+
+      - name: Install Beta Rust Toolchain (${{ matrix.target_triple }})
+        uses: dtolnay/rust-toolchain@beta
+        with:
+          components: clippy
+          targets: ${{ matrix.target_triple }}
+
+      - name: Install Stable Rust Toolchain (${{ matrix.target_triple }})
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
           targets: ${{ matrix.target_triple }}
 
       - name: Install Cargo Make

Makefile.toml

@@ -49,7 +49,10 @@ assert ${success} "Failed to delete tests directory"
 '''
 
 [tasks.test]
-install_crate = { crate_name = "cargo-expand", version = "1.0.80" }
+install_crate = { crate_name = "cargo-expand", binary = "cargo", test_arg = [
+  "expand",
+  "--version",
+], version = "1.0.80" }
 
 [tasks.audit]
 args = ["audit", "--deny", "warnings"]
@@ -67,7 +70,6 @@ alias = "pre-test"
 
 [tasks.nightly-test]
 extend = "test"
-install_crate = { crate_name = "cargo-expand", version = "1.0.80" }
 env = { CARGO_MAKE_CARGO_BUILD_TEST_FLAGS = "--features nightly" }
 toolchain = "nightly"