From bff95b85eef61462092b463d199fa18f127656eb Mon Sep 17 00:00:00 2001 From: Clement Rey Date: Wed, 5 Apr 2023 20:57:29 +0200 Subject: [PATCH] and other annoyances --- crates/re_arrow_store/benches/arrow2.rs | 4 ++-- crates/re_arrow_store/benches/arrow2_convert.rs | 4 ++-- crates/re_arrow_store/benches/vectors.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/re_arrow_store/benches/arrow2.rs b/crates/re_arrow_store/benches/arrow2.rs index 24f84219b6b2..af02ac5289a6 100644 --- a/crates/re_arrow_store/benches/arrow2.rs +++ b/crates/re_arrow_store/benches/arrow2.rs @@ -9,7 +9,7 @@ use arrow2::{ array::{Array, PrimitiveArray, StructArray, UnionArray}, compute::aggregate::estimated_bytes_size, }; -use criterion::{criterion_group, criterion_main, Criterion}; +use criterion::{criterion_group, Criterion}; use itertools::Itertools; use re_log_types::{ component_types::{InstanceKey, Point2D, Rect2D}, @@ -23,7 +23,7 @@ use re_log_types::{ criterion_group!(benches, erased_clone, estimated_size_bytes); #[cfg(not(feature = "dont_bench_third_party"))] -criterion_main!(benches); +criterion::criterion_main!(benches); // Don't run these benchmarks on CI: they measure the performance of third-party libraries. #[cfg(feature = "dont_bench_third_party")] diff --git a/crates/re_arrow_store/benches/arrow2_convert.rs b/crates/re_arrow_store/benches/arrow2_convert.rs index 2d615c000da9..92a070e49f28 100644 --- a/crates/re_arrow_store/benches/arrow2_convert.rs +++ b/crates/re_arrow_store/benches/arrow2_convert.rs @@ -4,7 +4,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; use arrow2::{array::PrimitiveArray, datatypes::PhysicalType, types::PrimitiveType}; -use criterion::{criterion_group, criterion_main, Criterion}; +use criterion::{criterion_group, Criterion}; use re_log_types::{ component_types::InstanceKey, external::arrow2_convert::deserialize::TryIntoCollection, Component as _, DataCell, @@ -15,7 +15,7 @@ use re_log_types::{ criterion_group!(benches, serialize, deserialize); #[cfg(not(feature = "dont_bench_third_party"))] -criterion_main!(benches); +criterion::criterion_main!(benches); // Don't run these benchmarks on CI: they measure the performance of third-party libraries. #[cfg(feature = "dont_bench_third_party")] diff --git a/crates/re_arrow_store/benches/vectors.rs b/crates/re_arrow_store/benches/vectors.rs index 82077c6c3461..0ddd3b316e31 100644 --- a/crates/re_arrow_store/benches/vectors.rs +++ b/crates/re_arrow_store/benches/vectors.rs @@ -3,7 +3,7 @@ #[global_allocator] static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; -use criterion::{criterion_group, criterion_main, Criterion}; +use criterion::{criterion_group, Criterion}; use smallvec::SmallVec; use tinyvec::TinyVec; @@ -13,7 +13,7 @@ use tinyvec::TinyVec; criterion_group!(benches, sort, split, swap, swap_opt); #[cfg(not(feature = "dont_bench_third_party"))] -criterion_main!(benches); +criterion::criterion_main!(benches); // Don't run these benchmarks on CI: they measure the performance of third-party libraries. #[cfg(feature = "dont_bench_third_party")]