From f707f23c0e1398e3ccef0a850be882dcfddcc2c0 Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Fri, 31 Dec 2021 14:53:07 +0900
Subject: [PATCH 1/2] Revert "Disable feature check on MSRV"

This reverts commit bce74ca9a5405c31204894a8c4b8f13d16fa9686.
---
 .github/workflows/ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7553bb4ef..896a9398a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -67,9 +67,7 @@ jobs:
       fail-fast: false
       matrix:
         rust:
-          # Some dependencies of benchmarks use the 2021 edition.
-          # TODO: Uncomment once https://github.com/taiki-e/cargo-hack/issues/135 implemented.
-          # - 1.36.0
+          - 1.36.0
           - nightly
     runs-on: ubuntu-latest
     steps:

From b64d3745a578faa9b5f39c1a764d654af2939a6e Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Sat, 1 Jan 2022 05:04:58 +0900
Subject: [PATCH 2/2] Make installation of cargo-hack faster and robust

---
 .github/workflows/ci.yml | 2 ++
 ci/check-features.sh     | 4 ----
 ci/dependencies.sh       | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7553bb4ef..dadce7d24 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,6 +76,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install Rust
         run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
+      - uses: taiki-e/install-action@cargo-hack
       - name: Check features
         run: ./ci/check-features.sh
 
@@ -87,6 +88,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install Rust
         run: rustup update nightly && rustup default nightly
+      - uses: taiki-e/install-action@cargo-hack
       - name: dependency tree check
         run: ./ci/dependencies.sh
 
diff --git a/ci/check-features.sh b/ci/check-features.sh
index 17fc1a8c1..8d1f66f90 100755
--- a/ci/check-features.sh
+++ b/ci/check-features.sh
@@ -3,10 +3,6 @@
 cd "$(dirname "$0")"/..
 set -ex
 
-if [[ ! -x "$(command -v cargo-hack)" ]]; then
-    cargo +stable install --debug cargo-hack || exit 1
-fi
-
 if [[ "$RUST_VERSION" != "nightly"* ]]; then
     # On MSRV, features other than nightly should work.
     # * `--feature-powerset` - run for the feature powerset which includes --no-default-features and default features of package
diff --git a/ci/dependencies.sh b/ci/dependencies.sh
index 168eeb611..db7e7321d 100755
--- a/ci/dependencies.sh
+++ b/ci/dependencies.sh
@@ -3,8 +3,6 @@
 cd "$(dirname "$0")"/..
 set -ex
 
-cargo install cargo-hack
-
 cargo tree
 cargo tree --duplicate
 cargo tree --duplicate || exit 1