feat!: remove csv_output (#33)

Cargo.toml

@@ -38,7 +38,6 @@ oorandom   = "11.1.3"
 
 # Optional dependencies
 rayon     = { version = "1.10", optional = true }
-csv       = { version = "1.3", optional = true }
 futures   = { version = "0.3.30", default-features = false, optional = true }
 smol      = { version = "2.0", default-features = false, optional = true }
 tokio     = { version = "1.38.0", default-features = false, features = ["rt"], optional = true }
@@ -58,7 +57,7 @@ futures    = { version = "0.3.30", default-features = false, features = ["execut
 [features]
 default = ["cargo_bench_support", "rayon"]
 
-stable = ["async_futures", "async_smol", "async_std", "async_tokio", "csv_output"]
+stable = ["async_futures", "async_smol", "async_std", "async_tokio"]
 
 ## Enables [codspeed](https://codspeed.io)
 codspeed = ["dep:codspeed", "dep:colored"]
@@ -79,11 +78,6 @@ async_std = ["async", "async-std"]
 # required in order to have Criterion.rs be usable outside of cargo-criterion.
 cargo_bench_support = []
 
-# This feature _currently_ does nothing, but in 0.4.0 it will be
-# required in order to have Criterion.rs generate CSV files. This feature is deprecated in favor of
-# cargo-criterion's --message-format=json option.
-csv_output = ["csv"]
-
 # Enable all of the async runtimes for the docs.rs output
 [package.metadata.docs.rs]
 features = ["async_futures", "async_smol", "async_std", "async_tokio"]

src/analysis/mod.rs

@@ -336,6 +336,4 @@ fn copy_new_dir_to_base(id: &str, baseline: &str, output_directory: &Path) {
     try_else_return!(fs::cp(&new_dir.join("sample.json"), &base_dir.join("sample.json")));
     try_else_return!(fs::cp(&new_dir.join("tukey.json"), &base_dir.join("tukey.json")));
     try_else_return!(fs::cp(&new_dir.join("benchmark.json"), &base_dir.join("benchmark.json")));
-    #[cfg(feature = "csv_output")]
-    try_else_return!(fs::cp(&new_dir.join("raw.csv"), &base_dir.join("raw.csv")));
 }

src/criterion.rs

@@ -63,7 +63,6 @@ impl Default for Criterion {
             cli: CliReport::new(false, false, CliVerbosity::Normal),
             bencher_enabled: false,
             bencher: BencherReport,
-            csv_enabled: cfg!(feature = "csv_output"),
         };
 
         let mut criterion = Criterion {
@@ -86,7 +85,6 @@ impl Default for Criterion {
             // disable all reports when connected to cargo-criterion; it will do the reporting.
             criterion.report.cli_enabled = false;
             criterion.report.bencher_enabled = false;
-            criterion.report.csv_enabled = false;
         }
         criterion
     }
@@ -411,7 +409,6 @@ impl<M: Measurement> Criterion<M> {
             // disable all reports when connected to cargo-criterion; it will do the reporting.
             self.report.cli_enabled = false;
             self.report.bencher_enabled = false;
-            self.report.csv_enabled = false;
         } else {
             match opts.output_format {
                 OutputFormat::Bencher => {

src/error.rs

@@ -1,28 +1,13 @@
 use std::{error::Error as StdError, fmt, io, path::PathBuf};
 
-#[cfg(feature = "csv_output")]
-use csv::Error as CsvError;
 use serde_json::Error as SerdeError;
 
 #[allow(clippy::enum_variant_names)]
 #[derive(Debug)]
 pub enum Error {
-    AccessError {
-        path: PathBuf,
-        inner: io::Error,
-    },
-    CopyError {
-        from: PathBuf,
-        to: PathBuf,
-        inner: io::Error,
-    },
-    SerdeError {
-        path: PathBuf,
-        inner: SerdeError,
-    },
-    #[cfg(feature = "csv_output")]
-    /// This API requires the following crate features to be activated: csv_output
-    CsvError(CsvError),
+    AccessError { path: PathBuf, inner: io::Error },
+    CopyError { from: PathBuf, to: PathBuf, inner: io::Error },
+    SerdeError { path: PathBuf, inner: SerdeError },
 }
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -38,8 +23,6 @@ impl fmt::Display for Error {
                 "Failed to read or write file {:?} due to serialization error: {}",
                 path, inner
             ),
-            #[cfg(feature = "csv_output")]
-            Error::CsvError(inner) => write!(f, "CSV error: {}", inner),
         }
     }
 }
@@ -49,8 +32,6 @@ impl StdError for Error {
             Error::AccessError { .. } => "AccessError",
             Error::CopyError { .. } => "CopyError",
             Error::SerdeError { .. } => "SerdeError",
-            #[cfg(feature = "csv_output")]
-            Error::CsvError(_) => "CsvError",
         }
     }
 
@@ -59,19 +40,10 @@ impl StdError for Error {
             Error::AccessError { inner, .. } => Some(inner),
             Error::CopyError { inner, .. } => Some(inner),
             Error::SerdeError { inner, .. } => Some(inner),
-            #[cfg(feature = "csv_output")]
-            Error::CsvError(inner) => Some(inner),
         }
     }
 }
 
-#[cfg(feature = "csv_output")]
-impl From<CsvError> for Error {
-    fn from(other: CsvError) -> Error {
-        Error::CsvError(other)
-    }
-}
-
 pub type Result<T> = ::std::result::Result<T, Error>;
 
 pub(crate) fn log_error(e: &Error) {

src/lib.rs

@@ -47,8 +47,6 @@ mod bencher;
 mod cli;
 mod connection;
 mod criterion;
-#[cfg(feature = "csv_output")]
-mod csv_report;
 mod error;
 mod estimate;
 mod format;

src/report.rs

@@ -9,8 +9,6 @@ use std::{
 use anes::{Attribute, ClearLine, Color, ResetAttributes, SetAttribute, SetForegroundColor};
 use serde::{Deserialize, Serialize};
 
-#[cfg(feature = "csv_output")]
-use crate::csv_report::FileCsvReport;
 use crate::{
     estimate::{ChangeDistributions, ChangeEstimates, Distributions, Estimate, Estimates},
     format,
@@ -52,11 +50,6 @@ impl<'a> MeasurementData<'a> {
     pub fn iter_counts(&self) -> &Sample<f64> {
         self.data.x()
     }
-
-    #[cfg(feature = "csv_output")]
-    pub fn sample_times(&self) -> &Sample<f64> {
-        self.data.y()
-    }
 }
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
@@ -295,7 +288,6 @@ pub(crate) struct Reports {
     pub(crate) cli: CliReport,
     pub(crate) bencher_enabled: bool,
     pub(crate) bencher: BencherReport,
-    pub(crate) csv_enabled: bool,
 }
 macro_rules! reports_impl {
     (fn $name:ident(&self, $($argn:ident: $argt:ty),*)) => {
@@ -306,10 +298,6 @@ macro_rules! reports_impl {
             if self.bencher_enabled {
                 self.bencher.$name($($argn),*);
             }
-            #[cfg(feature = "csv_output")]
-            if self.csv_enabled {
-                FileCsvReport.$name($($argn),*);
-            }
         }
     };
 }

tests/criterion_tests.rs

@@ -73,8 +73,6 @@ fn verify_stats(dir: &Path, baseline: &str) {
     verify_json(dir, &format!("{}/sample.json", baseline));
     verify_json(dir, &format!("{}/tukey.json", baseline));
     verify_json(dir, &format!("{}/benchmark.json", baseline));
-    #[cfg(feature = "csv_output")]
-    verify_file(dir, &format!("{}/raw.csv", baseline));
 }
 
 fn verify_not_exists(dir: &Path, path: &str) {