From 59f9473336d635e068a1e14eba7316316d4dae94 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Tue, 7 Dec 2021 08:24:13 -0600
Subject: [PATCH 1/2] chore: Make makefile easier to use

---
 .github/workflows/ci.yml        | 2 ++
 .github/workflows/rust-next.yml | 2 ++
 Makefile                        | 3 +--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ddb6fd75bdd..8b3e6c8b57a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,6 +66,8 @@ jobs:
       run: make build-${{matrix.features}}
     - name: Test
       run: make test-${{matrix.features}}
+    - name: Test (benches)
+      run: make test-${{matrix.features}} ARGS='--workspace --benches'
   check:
     name: Check
     runs-on: ubuntu-latest
diff --git a/.github/workflows/rust-next.yml b/.github/workflows/rust-next.yml
index 3cefd960c6c..6a19b9a12be 100644
--- a/.github/workflows/rust-next.yml
+++ b/.github/workflows/rust-next.yml
@@ -53,6 +53,8 @@ jobs:
       run: make build-${{matrix.features}}
     - name: Test
       run: make test-${{matrix.features}}
+    - name: Test (benches)
+      run: make test-${{matrix.features}} ARGS='--workspace --benches'
   rustfmt:
     name: rustfmt
     strategy:
diff --git a/Makefile b/Makefile
index 3549935d7ec..3cf9917a94b 100644
--- a/Makefile
+++ b/Makefile
@@ -25,5 +25,4 @@ build-%:
 	cargo test ${_FEATURES_${@:build-%=%}} --all-targets --no-run ${ARGS}
 
 test-%:
-	cargo test ${_FEATURES_${@:test-%=%}} --all-targets ${ARGS}
-	cargo test ${_FEATURES_${@:test-%=%}} --doc ${ARGS}
+	cargo test ${_FEATURES_${@:test-%=%}} ${ARGS}

From df258eaa31c690804ed6226341f1f2665237f5c8 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Tue, 7 Dec 2021 08:29:03 -0600
Subject: [PATCH 2/2] chore(ci): Ensure we test minimum features

I was working to drop the active features across all crates, so that
when cargo unified them during `--workspace`, we'd get this for free.
Alas, it looks like its not happening.
---
 .github/workflows/ci.yml        | 3 +++
 .github/workflows/rust-next.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8b3e6c8b57a..54efa814953 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,6 +68,9 @@ jobs:
       run: make test-${{matrix.features}}
     - name: Test (benches)
       run: make test-${{matrix.features}} ARGS='--workspace --benches'
+    - name: Test (ultra-minimal)
+      if: matrix.build == 'minimal'
+      run: make test-minimal ARGS='--manifest-path Cargo.toml'
   check:
     name: Check
     runs-on: ubuntu-latest
diff --git a/.github/workflows/rust-next.yml b/.github/workflows/rust-next.yml
index 6a19b9a12be..6b0ea11e5e7 100644
--- a/.github/workflows/rust-next.yml
+++ b/.github/workflows/rust-next.yml
@@ -55,6 +55,9 @@ jobs:
       run: make test-${{matrix.features}}
     - name: Test (benches)
       run: make test-${{matrix.features}} ARGS='--workspace --benches'
+    - name: Test (ultra-minimal)
+      if: matrix.build == 'minimal'
+      run: make test-minimal ARGS='--manifest-path Cargo.toml'
   rustfmt:
     name: rustfmt
     strategy: