From c66af2c0a92563411c048d0ab470b37f4953a82f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 09:41:35 +0800 Subject: [PATCH] Update binggan requirement from 0.12.0 to 0.14.0 (#2530) * Update binggan requirement from 0.12.0 to 0.14.0 --- updated-dependencies: - dependency-name: binggan dependency-type: direct:production ... Signed-off-by: dependabot[bot] * fix build --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pascal Seitz --- Cargo.toml | 2 +- benches/agg_bench.rs | 1 - columnar/Cargo.toml | 2 +- columnar/benches/bench_access.rs | 2 -- columnar/benches/bench_merge.rs | 4 ++-- common/Cargo.toml | 2 +- common/benches/bench.rs | 6 ------ stacker/Cargo.toml | 2 +- stacker/benches/bench.rs | 8 -------- 9 files changed, 6 insertions(+), 23 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 96fdd8a528..b60e760dab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,7 +72,7 @@ fnv = "1.0.7" winapi = "0.3.9" [dev-dependencies] -binggan = "0.12.0" +binggan = "0.14.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 2690ea7ab8..7004b46e03 100644 --- a/benches/agg_bench.rs +++ b/benches/agg_bench.rs @@ -20,7 +20,6 @@ macro_rules! register { ($runner:expr, $func:ident) => { $runner.register(stringify!($func), move |index| { $func(index); - None }) }; } diff --git a/columnar/Cargo.toml b/columnar/Cargo.toml index 99693eba50..1685f95686 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.12.0" +binggan = "0.14.0" [[bench]] name = "bench_merge" diff --git a/columnar/benches/bench_access.rs b/columnar/benches/bench_access.rs index 571c07ff20..e40d3f179d 100644 --- a/columnar/benches/bench_access.rs +++ b/columnar/benches/bench_access.rs @@ -42,7 +42,6 @@ fn bench_group(mut runner: InputGroup) { } } black_box(sum); - None }); runner.register("access_first_vals", |column| { let mut sum = 0; @@ -63,7 +62,6 @@ 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 c3b83ace32..ec1bca942b 100644 --- a/columnar/benches/bench_merge.rs +++ b/columnar/benches/bench_merge.rs @@ -1,6 +1,6 @@ pub mod common; -use binggan::{black_box, BenchRunner}; +use binggan::BenchRunner; use common::{generate_columnar_with_name, Card}; use tantivy_columnar::*; @@ -29,7 +29,7 @@ fn main() { add_combo(Card::Multi, Card::Dense); add_combo(Card::Multi, Card::Sparse); - let runner: BenchRunner = BenchRunner::new(); + let mut runner: BenchRunner = BenchRunner::new(); let mut group = runner.new_group(); for (input_name, columnar_readers) in inputs.iter() { group.register_with_input( diff --git a/common/Cargo.toml b/common/Cargo.toml index e6cf5b1a58..63394e7a29 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.12.0" +binggan = "0.14.0" proptest = "1.0.0" rand = "0.8.4" diff --git a/common/benches/bench.rs b/common/benches/bench.rs index 01cb6d2300..10f176428a 100644 --- a/common/benches/bench.rs +++ b/common/benches/bench.rs @@ -15,7 +15,6 @@ 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); @@ -27,7 +26,6 @@ fn bench_vint() { out += u64::from(buf[0]); } black_box(out); - None }); } @@ -43,24 +41,20 @@ 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 }); } diff --git a/stacker/Cargo.toml b/stacker/Cargo.toml index c9eec6dc34..4723ed804e 100644 --- a/stacker/Cargo.toml +++ b/stacker/Cargo.toml @@ -28,7 +28,7 @@ rand = "0.8.5" zipf = "7.0.0" rustc-hash = "1.1.0" proptest = "1.2.0" -binggan = { version = "0.12.0" } +binggan = { version = "0.14.0" } [features] compare_hash_only = ["ahash"] # Compare hash only, not the key in the Hashmap diff --git a/stacker/benches/bench.rs b/stacker/benches/bench.rs index 346586969f..185451bbda 100644 --- a/stacker/benches/bench.rs +++ b/stacker/benches/bench.rs @@ -35,14 +35,12 @@ fn bench_vint() { group.set_input_size(input_bytes); group.register_with_input("hashmap", &alice_terms_as_bytes, move |data| { black_box(create_hash_map(data.iter())); - Some(()) }); group.register_with_input( "hasmap with postings", &alice_terms_as_bytes_with_docid, move |data| { black_box(create_hash_map_with_expull(data.iter().cloned())); - Some(()) }, ); group.register_with_input( @@ -50,7 +48,6 @@ fn bench_vint() { &alice_terms_as_bytes, move |data| { black_box(create_fx_hash_ref_map_with_expull(data.iter().cloned())); - Some(()) }, ); group.register_with_input( @@ -58,7 +55,6 @@ fn bench_vint() { &alice_terms_as_bytes, move |data| { black_box(create_fx_hash_owned_map_with_expull(data.iter().cloned())); - Some(()) }, ); group.run(); @@ -86,11 +82,9 @@ fn bench_vint() { group.set_input_size(input_bytes); group.register_with_input("only hashmap", &numbers, move |data| { black_box(create_hash_map(data.iter())); - Some(()) }); group.register_with_input("hasmap with postings", &numbers_with_doc, move |data| { black_box(create_hash_map_with_expull(data.iter().cloned())); - Some(()) }); group.run(); } @@ -115,11 +109,9 @@ fn bench_vint() { group.set_input_size(input_bytes); group.register_with_input("hashmap", &numbers, move |data| { black_box(create_hash_map(data.iter())); - Some(()) }); group.register_with_input("hasmap with postings", &numbers_with_doc, move |data| { black_box(create_hash_map_with_expull(data.iter().cloned())); - Some(()) }); group.run(); }