diff --git a/Cargo.toml b/Cargo.toml index 18f0b6693..55856c964 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,7 +72,7 @@ fnv = "1.0.7" winapi = "0.3.9" [dev-dependencies] -binggan = "0.8.0" +binggan = "0.10.0" rand = "0.8.5" maplit = "1.0.2" matches = "0.1.9" diff --git a/benches/agg_bench.rs b/benches/agg_bench.rs index 46a4f6080..1a2322cd1 100644 --- a/benches/agg_bench.rs +++ b/benches/agg_bench.rs @@ -17,7 +17,10 @@ pub static GLOBAL: &PeakMemAlloc = &INSTRUMENTED_SYSTEM; /// runner.register("average_u64", move |index| average_u64(index)); macro_rules! register { ($runner:expr, $func:ident) => { - $runner.register(stringify!($func), move |index| $func(index)) + $runner.register(stringify!($func), move |index| { + $func(index); + None + }) }; } diff --git a/columnar/Cargo.toml b/columnar/Cargo.toml index 46e8b49f0..4bf322ffd 100644 --- a/columnar/Cargo.toml +++ b/columnar/Cargo.toml @@ -23,7 +23,7 @@ downcast-rs = "1.2.0" proptest = "1" more-asserts = "0.3.1" rand = "0.8" -binggan = "0.8.1" +binggan = "0.10.0" [[bench]] name = "bench_merge" diff --git a/columnar/benches/bench_access.rs b/columnar/benches/bench_access.rs index e40d3f179..571c07ff2 100644 --- a/columnar/benches/bench_access.rs +++ b/columnar/benches/bench_access.rs @@ -42,6 +42,7 @@ fn bench_group(mut runner: InputGroup) { } } black_box(sum); + None }); runner.register("access_first_vals", |column| { let mut sum = 0; @@ -62,6 +63,7 @@ fn bench_group(mut runner: InputGroup) { } black_box(sum); + None }); runner.run(); } diff --git a/columnar/benches/bench_merge.rs b/columnar/benches/bench_merge.rs index 9e6d33d41..c3b83ace3 100644 --- a/columnar/benches/bench_merge.rs +++ b/columnar/benches/bench_merge.rs @@ -41,7 +41,7 @@ fn main() { let merge_row_order = StackMergeOrder::stack(&columnar_readers[..]); merge_columnar(&columnar_readers, &[], merge_row_order.into(), &mut out).unwrap(); - black_box(out); + Some(out.len() as u64) }, ); } diff --git a/common/Cargo.toml b/common/Cargo.toml index c43c05255..9d6dd69e6 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -19,7 +19,7 @@ time = { version = "0.3.10", features = ["serde-well-known"] } serde = { version = "1.0.136", features = ["derive"] } [dev-dependencies] -binggan = "0.8.1" +binggan = "0.10.0" proptest = "1.0.0" rand = "0.8.4" diff --git a/common/benches/bench.rs b/common/benches/bench.rs index 10f176428..01cb6d230 100644 --- a/common/benches/bench.rs +++ b/common/benches/bench.rs @@ -15,6 +15,7 @@ fn bench_vint() { out += u64::from(buf[0]); } black_box(out); + None }); let vals: Vec = (0..20_000).choose_multiple(&mut thread_rng(), 100_000); @@ -26,6 +27,7 @@ fn bench_vint() { out += u64::from(buf[0]); } black_box(out); + None }); } @@ -41,20 +43,24 @@ fn bench_bitset() { tinyset.pop_lowest(); tinyset.pop_lowest(); black_box(tinyset); + None }); let tiny_set = TinySet::empty().insert(10u32).insert(14u32).insert(21u32); runner.bench_function("bench_tinyset_sum", move |_| { assert_eq!(black_box(tiny_set).into_iter().sum::(), 45u32); + None }); let v = [10u32, 14u32, 21u32]; runner.bench_function("bench_tinyarr_sum", move |_| { black_box(v.iter().cloned().sum::()); + None }); runner.bench_function("bench_bitset_initialize", move |_| { black_box(BitSet::with_max_value(1_000_000)); + None }); }