feat(cargo-codspeed): use cargo from cli

Author: GuillaumeLagrange

Cargo.lock

@@ -18,7 +18,7 @@ categories = [
 keywords = ["codspeed", "benchmark", "cargo"]
 
 [dependencies]
-cargo = "0.81.0"
+cargo_metadata = "0.19.1"
 clap = { version = "=4.5.17", features = ["derive"] }
 termcolor = "1.4"
 anyhow = "1.0.86"
@@ -30,6 +30,3 @@ assert_cmd = "2.0.15"
 fs_extra = "1.3.0"
 predicates = "3.1.2"
 uuid = { version = "1.10.0", features = ["v4"] }
-
-[features]
-vendored-openssl = ["cargo/vendored-openssl"]

crates/cargo-codspeed/Cargo.toml

@@ -12,7 +12,13 @@ A cargo subcommand for running CodSpeed on your project
 
 ## Installation
 
-### With `cargo-binstall`(recommended)
+### With `cargo`
+
+```bash
+cargo install cargo-codspeed --locked
+```
+
+### With `cargo-binstall`(recommended in CI)
 
 [`cargo-binstall`](https://github.com/cargo-bins/cargo-binstall) enables you to install binaries directly without having to build from the source(with `cargo install`) every time.
 
@@ -28,12 +34,6 @@ You can then install `cargo-codspeed` with:
 cargo binstall cargo-codspeed
 ```
 
-### With `cargo`
-
-```bash
-cargo install cargo-codspeed --locked
-```
-
 ## Usage
 
 ```
@@ -48,10 +48,6 @@ Options:
   -V, --version  Print version information
 ```
 
-## Advanced Usage
-
-The `vendored-openssl` feature can be used to statically link with openssl with `cargo install cargo-codspeed --features vendored-openssl`.
-
 ## Development
 
 ### Troubleshooting

crates/cargo-codspeed/README.md

@@ -1,44 +1,49 @@
-use std::{ffi::OsString, process::exit};
-
-use crate::helpers::style;
 use crate::{prelude::*, run::run_benches};
-
-use cargo::GlobalContext;
-use cargo::{ops::Packages, util::important_paths::find_root_manifest_for_wd};
+use cargo_metadata::MetadataCommand;
 use clap::{Args, Parser, Subcommand};
+use std::{ffi::OsString, process::exit};
 
 use crate::build::build_benches;
 
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
 struct Cli {
+    /// Do not print cargo log messages
+    #[arg(short, long, global = true)]
+    quiet: bool,
+
     #[command(subcommand)]
     command: Commands,
 }
 
-/// Package selection flags
 #[derive(Args)]
-struct PackageSelection {
+pub(crate) struct PackageFilters {
     /// Select all packages in the workspace
     #[arg(long)]
-    workspace: bool,
+    pub(crate) workspace: bool,
     /// Exclude packages
     #[arg(long)]
-    exclude: Vec<String>,
-    /// Package to select
+    pub(crate) exclude: Vec<String>,
+    /// Package to select (builds all workspace package by default)
     #[arg(short, long)]
-    package: Vec<String>,
+    pub(crate) package: Vec<String>,
+}
+
+/// Package selection flags
+#[derive(Args)]
+pub(crate) struct Filters {
+    /// Optional list of benchmarks to build (builds all benchmarks by default)
+    pub(crate) bench: Option<Vec<String>>,
+    #[command(flatten)]
+    pub(crate) package: PackageFilters,
 }
 
 #[derive(Subcommand)]
 enum Commands {
     /// Build the benchmarks
     Build {
-        /// Optional list of benchmarks to build (builds all benchmarks by default)
-        benches: Option<Vec<String>>,
-
         #[command(flatten)]
-        package_selection: PackageSelection,
+        filters: Filters,
 
         /// Space or comma separated list of features to activate
         #[arg(short = 'F', long)]
@@ -50,60 +55,40 @@ enum Commands {
     },
     /// Run the previously built benchmarks
     Run {
-        /// Optional list of benchmarks to run (run all found benchmarks by default)
-        benches: Option<Vec<String>>,
-
         #[command(flatten)]
-        package_selection: PackageSelection,
+        filters: Filters,
     },
 }
 
-pub fn get_cargo_config() -> Result<GlobalContext> {
+/// Forward the `codspeed` cfg flag to the compiler through env variable for all managed here operations
+fn set_codspeed_rustflags() {
     let mut rustflags = std::env::var("RUSTFLAGS").unwrap_or_else(|_| "".into());
     rustflags.push_str(" -g --cfg codspeed");
     std::env::set_var("RUSTFLAGS", &rustflags);
-    GlobalContext::default()
 }
 
 pub fn run(args: impl Iterator<Item = OsString>) -> Result<()> {
+    set_codspeed_rustflags();
+
+    let metadata = MetadataCommand::new().exec()?;
+
     let cli = Cli::try_parse_from(args)?;
-    let cargo_config = get_cargo_config()?;
-    let manifest_path = find_root_manifest_for_wd(cargo_config.cwd())?;
-    let ws = Workspace::new(&manifest_path, &cargo_config)?;
 
     let res = match cli.command {
         Commands::Build {
-            benches,
-            package_selection,
+            filters,
             features,
             profile,
         } => {
             let features =
                 features.map(|f| f.split([' ', ',']).map(|s| s.to_string()).collect_vec());
-            let packages = Packages::from_flags(
-                package_selection.workspace,
-                package_selection.exclude,
-                package_selection.package,
-            )?;
-            build_benches(&ws, benches, packages, features, profile)
-        }
-        Commands::Run {
-            benches,
-            package_selection,
-        } => {
-            let packages = Packages::from_flags(
-                package_selection.workspace,
-                package_selection.exclude,
-                package_selection.package,
-            )?;
-            run_benches(&ws, benches, packages)
+            build_benches(&metadata, filters, features, profile, cli.quiet)
         }
+        Commands::Run { filters } => run_benches(&metadata, filters),
     };
 
     if let Err(e) = res {
-        ws.gctx()
-            .shell()
-            .status_with_color("Error", e.to_string(), &style::ERROR)?;
+        eprintln!("Error: {e}");
         exit(1);
     }