From 9017de439f5c660ecd5710188d8646bb29510d9d Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Thu, 20 Jul 2023 00:22:55 +0100
Subject: [PATCH] ci: fix post-merge tool installs

---
 .github/workflows/ci-post-merge.yml | 16 ++++++++++------
 actix-macros/src/lib.rs             |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
index c107bb53..27f541a3 100644
--- a/.github/workflows/ci-post-merge.yml
+++ b/.github/workflows/ci-post-merge.yml
@@ -101,11 +101,13 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with: { toolchain: nightly }
 
+      - name: Install cargo-tarpaulin
+        uses: taiki-e/install-action@v1
+        with: { tool: cargo-tarpaulin }
+
       - name: Generate coverage file
         if: github.ref == 'refs/heads/master'
-        run: |
-          cargo install cargo-tarpaulin
-          cargo tarpaulin --out Xml --verbose
+        run: cargo tarpaulin --out Xml --verbose
       - name: Upload to Codecov
         if: github.ref == 'refs/heads/master'
         uses: codecov/codecov-action@v3
@@ -121,8 +123,9 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with: { toolchain: nightly }
 
-      - uses: taiki-e/install-action@v1
-        with: { tool: cargo-hack, cargo-minimal-versions }
+      - name: Install cargo-hack & cargo-minimal-versions
+        uses: taiki-e/install-action@v1
+        with: { tool: 'cargo-hack,cargo-minimal-versions' }
 
       - name: Check With Minimal Versions
         run: cargo minimal-versions check
@@ -137,7 +140,8 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - name: Install cargo-nextest
-        run: cargo install cargo-nextest
+        uses: taiki-e/install-action@v1
+        with: { tool: cargo-nextest }
 
       - name: Test with cargo-nextest
         run: cargo nextest run
diff --git a/actix-macros/src/lib.rs b/actix-macros/src/lib.rs
index 020b16db..481d1145 100644
--- a/actix-macros/src/lib.rs
+++ b/actix-macros/src/lib.rs
@@ -28,8 +28,8 @@ type AttributeArgs = syn::punctuated::Punctuated<syn::Meta, syn::Token![,]>;
 ///     println!("Hello world");
 /// }
 /// ```
-// #[allow(clippy::needless_doctest_main)]
-// #[cfg(not(test))] // Work around for rust-lang/rust#62127
+#[allow(clippy::needless_doctest_main)]
+#[cfg(not(test))] // Work around for rust-lang/rust#62127
 #[proc_macro_attribute]
 pub fn main(args: TokenStream, item: TokenStream) -> TokenStream {
     let mut input = match syn::parse::<syn::ItemFn>(item.clone()) {