Apply suggestions from @nvzqz

shnewto · Dec 2, 2023 · e05ae71 · e05ae71
1 parent 8b9e8f1
commit e05ae71
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,7 +34,7 @@ features = ["derive"]
 version = "1.0.61"
 
 [dev-dependencies]
-divan = "0.1.2"
+divan = "0.1.4"
 insta = { version = "1.26.0", default-features = false }
 
 [dev-dependencies.quickcheck]

diff --git a/benches/divan.rs b/benches/divan.rs
@@ -31,15 +31,13 @@ fn init_tracing() {}
 mod examples {
     #[divan::bench]
     fn parse_postal(bencher: divan::Bencher) {
-        bencher
-            .with_inputs(|| {
-                let input =
-                    std::include_str!("../tests/fixtures/postal_address.terminated.input.bnf");
-                input
-            })
-            .bench_refs(|input| {
-                input.parse::<bnf::Grammar>().unwrap();
-            });
+        let input = divan::black_box(include_str!(
+            "../tests/fixtures/postal_address.terminated.input.bnf"
+        ));
+
+        bencher.bench(|| {
+            input.parse::<bnf::Grammar>().unwrap();
+        });
     }
 
     #[divan::bench]
@@ -85,21 +83,21 @@ mod examples {
 
     #[divan::bench]
     fn parse_infinite_nullable_grammar(bencher: divan::Bencher) {
+        use rand::Rng;
+
         let infinite_grammar: bnf::Grammar = "
                 <a> ::= '' | <b>
                 <b> ::= <a>"
             .parse()
             .unwrap();
+
+        let mut rng: rand::rngs::StdRng = rand::SeedableRng::seed_from_u64(0);
+
         bencher
-            .with_inputs(|| {
-                use rand::Rng;
-                let mut rng: rand::rngs::StdRng = rand::SeedableRng::seed_from_u64(0);
-                let parse_count: usize = rng.gen_range(1..100);
-                parse_count
-            })
-            .input_counter(|parse_count| divan::counter::ItemsCount::new(*parse_count))
-            .bench_values(|parse_count| {
+            .with_inputs(|| rng.gen_range(1..100))
+            .count_inputs_as::<divan::counter::ItemsCount>()
+            .bench_local_values(|parse_count| {
                 let _: Vec<_> = infinite_grammar.parse_input("").take(parse_count).collect();
-            })
+            });
     }
 }