diff --git a/wacore/benches/reporting_token_benchmark.rs b/wacore/benches/reporting_token_benchmark.rs index b3c969d7e..b4a7fbbbd 100644 --- a/wacore/benches/reporting_token_benchmark.rs +++ b/wacore/benches/reporting_token_benchmark.rs @@ -51,18 +51,14 @@ fn setup_extended_message() -> wa::Message { fn bench_content_extraction_simple(bencher: divan::Bencher) { bencher .with_inputs(setup_simple_message) - .bench_values(|msg| { - let _ = black_box(generate_reporting_token_content(&msg)); - }); + .bench_refs(|msg| black_box(generate_reporting_token_content(msg))); } #[divan::bench] fn bench_content_extraction_extended(bencher: divan::Bencher) { bencher .with_inputs(setup_extended_message) - .bench_values(|msg| { - let _ = black_box(generate_reporting_token_content(&msg)); - }); + .bench_refs(|msg| black_box(generate_reporting_token_content(msg))); } // Key derivation benchmark @@ -117,14 +113,14 @@ fn setup_full_gen_extended() -> FullGenSetup { fn bench_full_token_generation_simple(bencher: divan::Bencher) { bencher .with_inputs(setup_full_gen_simple) - .bench_values(|data| { - let _ = black_box(generate_reporting_token( + .bench_refs(|data| { + black_box(generate_reporting_token( &data.msg, "STANZA123", &data.sender, &data.remote, Some(&data.secret), - )); + )) }); } @@ -132,14 +128,14 @@ fn bench_full_token_generation_simple(bencher: divan::Bencher) { fn bench_full_token_generation_extended(bencher: divan::Bencher) { bencher .with_inputs(setup_full_gen_extended) - .bench_values(|data| { - let _ = black_box(generate_reporting_token( + .bench_refs(|data| { + black_box(generate_reporting_token( &data.msg, "STANZA123", &data.sender, &data.remote, Some(&data.secret), - )); + )) }); } @@ -148,12 +144,12 @@ fn bench_full_token_generation_extended(bencher: divan::Bencher) { fn bench_message_encoding_simple(bencher: divan::Bencher) { bencher .with_inputs(setup_simple_message) - .bench_values(|msg| black_box(msg.encode_to_vec())); + .bench_refs(|msg| black_box(msg.encode_to_vec())); } #[divan::bench] fn bench_message_encoding_extended(bencher: divan::Bencher) { bencher .with_inputs(setup_extended_message) - .bench_values(|msg| black_box(msg.encode_to_vec())); + .bench_refs(|msg| black_box(msg.encode_to_vec())); } diff --git a/wacore/binary/benches/binary_benchmark.rs b/wacore/binary/benches/binary_benchmark.rs index e6eacf9ae..f7b099857 100644 --- a/wacore/binary/benches/binary_benchmark.rs +++ b/wacore/binary/benches/binary_benchmark.rs @@ -378,7 +378,7 @@ fn bench_roundtrip_exact_large(bencher: divan::Bencher) { fn bench_get_children_by_tag(bencher: divan::Bencher) { bencher .with_inputs(create_usync_like_node) - .bench_values(|node| { + .bench_refs(|node| { let usync = node.get_optional_child("usync").unwrap(); let list = usync.get_optional_child("list").unwrap(); @@ -411,7 +411,7 @@ fn setup_jid_heavy_marshaled() -> Vec { fn bench_jid_to_owned_access(bencher: divan::Bencher) { bencher .with_inputs(setup_jid_heavy_marshaled) - .bench_values(|marshaled| { + .bench_refs(|marshaled| { // Skip the flag byte at position 0 let node_ref = unmarshal_ref(&marshaled[1..]).unwrap(); @@ -427,5 +427,6 @@ fn bench_jid_to_owned_access(bencher: divan::Bencher) { black_box(parser.optional_jid("notify")); black_box(parser.optional_string("id")); black_box(parser.optional_string("type")); + node }); }