fix: revisit black box call

rome · Feb 1, 2022 · b20fa66 · b20fa66
1 parent a4b3824
commit b20fa66
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/xtask/bench/src/features/formatter.rs b/xtask/bench/src/features/formatter.rs
@@ -9,7 +9,7 @@ pub struct FormatterMeasurement {
     id: String,
     formatting: Duration,
 }
-pub fn benchmark_format_lib(id: &str, root: SyntaxNode) -> BenchmarkSummary {
+pub fn benchmark_format_lib(id: &str, root: &SyntaxNode) -> BenchmarkSummary {
     let formatter_timer = timing::start();
     run_format(root);
     let formatter_duration = formatter_timer.stop();
@@ -20,7 +20,7 @@ pub fn benchmark_format_lib(id: &str, root: SyntaxNode) -> BenchmarkSummary {
     })
 }
 
-pub fn run_format(root: SyntaxNode) {
+pub fn run_format(root: &SyntaxNode) {
     format(FormatOptions::default(), &root).unwrap();
 }
 

diff --git a/xtask/bench/src/lib.rs b/xtask/bench/src/lib.rs
@@ -1,7 +1,6 @@
 mod features;
 mod utils;
 
-use criterion::BatchSize;
 use rslint_parser::{parse, Syntax};
 use std::fmt::{Display, Formatter};
 use std::str::FromStr;
@@ -103,17 +102,13 @@ pub fn run(filter: String, criterion: bool, baseline: Option<String>, feature: F
                             #[allow(clippy::unit_arg)]
                             criterion::black_box(run_parse(code));
                         }),
-                        FeatureToBenchmark::Formatter => b.iter_batched(
-                            || {
-                                let syntax = Syntax::default().module();
-                                parse(code, 0, syntax).syntax()
-                            },
-                            |root| {
-                                #[allow(clippy::unit_arg)]
-                                criterion::black_box(run_format(root));
-                            },
-                            BatchSize::PerIteration,
-                        ),
+                        FeatureToBenchmark::Formatter => {
+                            let syntax = Syntax::default().module();
+                            let root = parse(code, 0, syntax).syntax();
+                            b.iter(|| {
+                                criterion::black_box(run_format(&root));
+                            })
+                        }
                     });
                     group.finish();
                 } else {
@@ -125,7 +120,7 @@ pub fn run(filter: String, criterion: bool, baseline: Option<String>, feature: F
                         FeatureToBenchmark::Formatter => {
                             let syntax = Syntax::default().module();
                             let root = parse(code, 0, syntax).syntax();
-                            run_format(root);
+                            run_format(&root);
                         }
                     }
                 }
@@ -135,7 +130,7 @@ pub fn run(filter: String, criterion: bool, baseline: Option<String>, feature: F
                     FeatureToBenchmark::Formatter => {
                         let syntax = Syntax::default().module();
                         let root = parse(code, 0, syntax).syntax();
-                        benchmark_format_lib(&id, root)
+                        benchmark_format_lib(&id, &root)
                     }
                 };