From f3369db8495f667b7c343e4b3341f41b2f2f6551 Mon Sep 17 00:00:00 2001
From: Arthur Pastel <arthur.pastel@gmail.com>
Date: Tue, 5 Sep 2023 14:50:06 +0200
Subject: [PATCH 1/2] fix: allow disabling criterion default features

---
 crates/criterion_compat/Cargo.toml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/crates/criterion_compat/Cargo.toml b/crates/criterion_compat/Cargo.toml
index 74b8c62..0461ee9 100644
--- a/crates/criterion_compat/Cargo.toml
+++ b/crates/criterion_compat/Cargo.toml
@@ -16,7 +16,7 @@ categories = [
 ]
 keywords = ["codspeed", "benchmark", "criterion"]
 [dependencies]
-criterion = "0.5.1"
+criterion = { version = "0.5.1", default-features = false }
 codspeed = { path = "../codspeed", version = "=2.1.0" }
 colored = "2.0.0"
 
@@ -28,13 +28,19 @@ tokio = { version = "1.0", default-features = false, features = [
 async-std = { version = "1.9", optional = true }
 
 [features]
+default = ["rayon", "plotters", "cargo_bench_support"]
+# Criterion.rs features
 async = ["futures", "criterion/async"]
-
 async_futures = ["criterion/async_futures", "futures/executor", "async"]
 async_smol = ["criterion/async_smol", "smol", "async"]
 async_tokio = ["criterion/async_tokio", "tokio", "async"]
 async_std = ["criterion/async_std", "async-std", "async"]
 
+html_reports = ["criterion/html_reports"]
+cargo_bench_support = ["criterion/cargo_bench_support"]
+csv_output = ["criterion/csv_output"]
+rayon = ["criterion/rayon"]
+plotters = ["criterion/plotters"]
 
 [[bench]]
 name = "criterion_example"

From 108897ca97a44bf0c71fa3f453d8cbdde8f78fe0 Mon Sep 17 00:00:00 2001
From: Arthur Pastel <arthur.pastel@gmail.com>
Date: Tue, 5 Sep 2023 15:01:40 +0200
Subject: [PATCH 2/2] chore: pin rust version in the CI

---
 .github/workflows/ci.yml | 12 ++++--------
 Cargo.lock               | 22 ++++++++++++++++++++++
 Cargo.toml               |  1 +
 rust-toolchain.toml      |  2 ++
 4 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 rust-toolchain.toml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 38dbd61..472e982 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,10 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: moonrepo/setup-rust@v0
+      - uses: moonrepo/setup-rust@v1
         with:
-          channel: stable
-          components: clippy
+          components: rustfmt, clippy
       - uses: pre-commit/action@v2.0.0
         with:
           extra_args: --all-files
@@ -23,18 +22,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: moonrepo/setup-rust@v0
-        with:
-          channel: stable
+      - uses: moonrepo/setup-rust@v1
       - run: cargo test --all
 
   compat-integration-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: moonrepo/setup-rust@v0
+      - uses: moonrepo/setup-rust@v1
         with:
-          channel: stable
           cache-target: release
 
       - run: cargo install --path crates/cargo-codspeed
diff --git a/Cargo.lock b/Cargo.lock
index 6929edc..a4ecac3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -666,6 +666,7 @@ dependencies = [
  "ciborium",
  "clap 4.0.29",
  "criterion-plot",
+ "csv",
  "futures",
  "is-terminal",
  "itertools",
@@ -749,6 +750,27 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "csv"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
+dependencies = [
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "ctor"
 version = "0.1.26"
diff --git a/Cargo.toml b/Cargo.toml
index f697511..91684ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,3 +5,4 @@ members = [
     "crates/criterion_compat",
     "crates/cargo-codspeed",
 ]
+resolver = "2"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000..aa46426
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.71.0"