fix(workspace): specify RUSTFLAGS through cargo and fix linter warnings

Wihtout it, the .vscode/settings.json was setting a `RUSTFLAGS` value
that was not shared by the cargo cli version, causing unneccessary
rebuilds between `cargo build` and an editor save.

Author: GuillaumeLagrange

.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+rustflags = ["--cfg", "codspeed"]

.vscode/settings.json

@@ -1,7 +1,4 @@
 {
-  "rust-analyzer.cargo.extraEnv": {
-    "RUSTFLAGS": "--cfg codspeed"
-  },
   "rust-analyzer.cargo.features": "all",
   "editor.formatOnSave": true,
   "rust-analyzer.checkOnSave": true,

crates/cargo-codspeed/src/app.rs

@@ -78,11 +78,8 @@ pub fn run(args: impl Iterator<Item = OsString>) -> Result<()> {
             features,
             profile,
         } => {
-            let features = features.map(|f| {
-                f.split(|c| c == ' ' || c == ',')
-                    .map(|s| s.to_string())
-                    .collect_vec()
-            });
+            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,

crates/cargo-codspeed/src/build.rs

@@ -123,7 +123,7 @@ pub fn build_benches(
             format!("{} {}", bench.package.name(), bench.target.name()),
             &style::ACTIVE,
         )?;
-        let is_root_package = ws.current_opt().map_or(false, |p| p == bench.package);
+        let is_root_package = ws.current_opt() == Some(bench.package);
         let benches_names = vec![bench.target.name()];
         let compile_opts = get_compile_options(
             context,

crates/cargo-codspeed/src/main.rs

@@ -10,7 +10,6 @@ use std::{env::args_os, process::exit};
 fn main() {
     let mut args_vec = args_os().collect_vec();
 
-    // let mut args_iter = args_os().into_iter();
     if args_vec.len() >= 2 && args_vec[1] == "codspeed" {
         args_vec[1] = "cargo codspeed".into();
         args_vec = args_vec.into_iter().skip(1).collect_vec();

crates/criterion_compat/src/compat/bencher.rs

@@ -15,7 +15,7 @@ pub struct Bencher<'a> {
     _marker: std::marker::PhantomData<&'a ()>,
 }
 
-impl<'a> Bencher<'a> {
+impl Bencher<'_> {
     pub fn new(codspeed: Rc<RefCell<CodSpeed>>, uri: String) -> Self {
         Bencher {
             codspeed,
@@ -123,7 +123,10 @@ impl<'a> Bencher<'a> {
             drop(black_box(input));
         }
     }
+}
 
+#[cfg(feature = "async")]
+impl<'a> Bencher<'a> {
     #[cfg(feature = "async")]
     pub fn to_async<'b, A: AsyncExecutor>(&'b mut self, runner: A) -> AsyncBencher<'a, 'b, A> {
         AsyncBencher { b: self, runner }
@@ -137,7 +140,7 @@ pub struct AsyncBencher<'a, 'b, A: AsyncExecutor> {
 }
 
 #[cfg(feature = "async")]
-impl<'a, 'b, A: AsyncExecutor> AsyncBencher<'a, 'b, A> {
+impl<A: AsyncExecutor> AsyncBencher<'_, '_, A> {
     #[allow(clippy::await_holding_refcell_ref)]
     #[inline(never)]
     pub fn iter<O, R, F>(&mut self, mut routine: R)

crates/criterion_compat/src/compat/group.rs

@@ -17,7 +17,7 @@ pub struct BenchmarkGroup<'a, M: Measurement = WallTime> {
     _marker: PhantomData<&'a M>,
 }
 
-impl<'a, M: Measurement> BenchmarkGroup<'a, M> {
+impl<M: Measurement> BenchmarkGroup<'_, M> {
     pub fn new(criterion: &mut Criterion<M>, group_name: String) -> BenchmarkGroup<M> {
         BenchmarkGroup::<M> {
             codspeed: criterion
@@ -79,7 +79,7 @@ impl<'a, M: Measurement> BenchmarkGroup<'a, M> {
 
 // Dummy methods
 #[allow(unused_variables)]
-impl<'a, M: Measurement> BenchmarkGroup<'a, M> {
+impl<M: Measurement> BenchmarkGroup<'_, M> {
     pub fn sample_size(&mut self, n: usize) -> &mut Self {
         self
     }