From b1abe039842d8ec8958d52c1485efd3f96537282 Mon Sep 17 00:00:00 2001
From: David Hewitt <1939362+davidhewitt@users.noreply.github.com>
Date: Sun, 15 Aug 2021 22:47:18 +0100
Subject: [PATCH] ci: update cargo-llvm-cov

---
 .github/workflows/ci.yml | 18 +++++++++---------
 Cargo.toml               |  3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b671a5a6..1b58fed0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -213,6 +213,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
         with:
+          # NB: doesn't include target dir so that the coverage stats are fresh
+          # each run.
           path: |
             ~/.cargo/registry
             ~/.cargo/git
@@ -223,22 +225,20 @@ jobs:
           wget https://github.com/taiki-e/cargo-llvm-cov/releases/download/v${CARGO_LLVM_COV_VERSION}/cargo-llvm-cov-x86_64-unknown-linux-gnu.tar.gz -qO- | tar -xzvf -
           mv cargo-llvm-cov ~/.cargo/bin
         env:
-          CARGO_LLVM_COV_VERSION: 0.1.0-alpha.5
+          CARGO_LLVM_COV_VERSION: 0.1.0
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly
           override: true
           profile: minimal
           components: llvm-tools-preview
-      # TODO: workaround for
-      # https://github.com/taiki-e/cargo-llvm-cov/issues/48, shouldn't be needed
-      # in next cargo-llvm-cov release.
-      - run: cargo clean
       - run: |
-          cargo llvm-cov \
-            --package pyo3 pyo3-build-config pyo3-macros-backend pyo3-macros \
-            --features "macros num-bigint num-complex hashbrown indexmap serde" \
-            --lcov --output-path coverage.lcov
+          cargo llvm-cov --package $ALL_PACKAGES --no-report
+          cargo llvm-cov --package $ALL_PACKAGES --no-report --features abi3
+          cargo llvm-cov --package $ALL_PACKAGES --no-report --features macros num-bigint num-complex hashbrown indexmap serde multiple-pymethods
+          cargo llvm-cov --package $ALL_PACKAGES --no-run --lcov --output-path coverage.lcov
+        env:
+          ALL_PACKAGES: pyo3 pyo3-build-config pyo3-macros-backend pyo3-macros
       - uses: codecov/codecov-action@v1
         with:
           file: coverage.lcov
diff --git a/Cargo.toml b/Cargo.toml
index cb0ac1ba..d5fb92f3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,8 +34,7 @@ serde = {version = "1.0", optional = true}
 assert_approx_eq = "1.1.0"
 # O.3.5 uses the matches! macro, which isn't compatible with Rust 1.41
 criterion = "=0.3.4"
-# Pinned for cargo-llvm-cov, see https://github.com/taiki-e/cargo-llvm-cov/issues/32
-trybuild = "1.0.43"
+trybuild = "1.0.45"
 rustversion = "1.0"
 proptest = { version = "0.10.1", default-features = false, features = ["std"] }
 # features needed to run the PyO3 test suite