This is an automated email from the ASF dual-hosted git repository.
paleolimbot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sedona-db.git
The following commit(s) were added to refs/heads/main by this push:
new 9115c194 chore: Use std::hint::black_box() to avoid deprecated
criterion usage (#432)
9115c194 is described below
commit 9115c194b013d30bb21ade974642229387b9a5b9
Author: Dewey Dunnington <[email protected]>
AuthorDate: Tue Dec 9 14:22:03 2025 -0600
chore: Use std::hint::black_box() to avoid deprecated criterion usage (#432)
---
Cargo.lock | 2 +-
c/sedona-geos/benches/wkb_to_geos.rs | 4 +-
rust/sedona-geo-generic-alg/benches/area.rs | 12 +--
rust/sedona-geo-generic-alg/benches/centroid.rs | 12 +--
rust/sedona-geo-generic-alg/benches/distance.rs | 94 +++++++++++-----------
.../sedona-geo-generic-alg/benches/intersection.rs | 44 +++++-----
rust/sedona-geo-generic-alg/benches/length.rs | 8 +-
rust/sedona-geo-generic-alg/benches/perimeter.rs | 8 +-
8 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 0295231a..541f06ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4908,7 +4908,7 @@ dependencies = [
[[package]]
name = "sedona-extension"
-version = "0.2.0"
+version = "0.3.0"
dependencies = [
"arrow-array",
"arrow-schema",
diff --git a/c/sedona-geos/benches/wkb_to_geos.rs
b/c/sedona-geos/benches/wkb_to_geos.rs
index cd2b9dbb..0ff3c72a 100644
--- a/c/sedona-geos/benches/wkb_to_geos.rs
+++ b/c/sedona-geos/benches/wkb_to_geos.rs
@@ -53,7 +53,7 @@ fn bench_parse(c: &mut criterion::Criterion) {
let factory = GEOSWkbFactory::new();
b.iter(|| {
let g = factory.create(&wkb).unwrap();
- criterion::black_box(g);
+ std::hint::black_box(g);
});
},
);
@@ -65,7 +65,7 @@ fn bench_parse(c: &mut criterion::Criterion) {
|b| {
b.iter(|| {
let g =
geos::Geometry::new_from_wkb(wkb.buf()).unwrap();
- criterion::black_box(g);
+ std::hint::black_box(g);
});
},
);
diff --git a/rust/sedona-geo-generic-alg/benches/area.rs
b/rust/sedona-geo-generic-alg/benches/area.rs
index ab9e5da8..b69a4568 100644
--- a/rust/sedona-geo-generic-alg/benches/area.rs
+++ b/rust/sedona-geo-generic-alg/benches/area.rs
@@ -28,7 +28,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let polygon = Polygon::new(norway, vec![]);
bencher.iter(|| {
- criterion::black_box(criterion::black_box(&polygon).signed_area());
+ std::hint::black_box(std::hint::black_box(&polygon).signed_area());
});
});
@@ -37,7 +37,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let polygon = Polygon::new(norway, vec![]);
bencher.iter(|| {
- criterion::black_box(criterion::black_box(&polygon).signed_area());
+ std::hint::black_box(std::hint::black_box(&polygon).signed_area());
});
});
@@ -46,7 +46,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let polygon = Polygon::new(norway, vec![]);
bencher.iter(|| {
-
criterion::black_box(geo::Area::signed_area(criterion::black_box(&polygon)));
+
std::hint::black_box(geo::Area::signed_area(std::hint::black_box(&polygon)));
});
});
@@ -55,7 +55,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let polygon = Polygon::new(norway, vec![]);
bencher.iter(|| {
-
criterion::black_box(geo::Area::signed_area(criterion::black_box(&polygon)));
+
std::hint::black_box(geo::Area::signed_area(std::hint::black_box(&polygon)));
});
});
@@ -66,7 +66,7 @@ fn criterion_benchmark(c: &mut Criterion) {
bencher.iter(|| {
let wkb_geom = wkb::reader::read_wkb(&wkb_bytes).unwrap();
- criterion::black_box(wkb_geom.signed_area());
+ std::hint::black_box(wkb_geom.signed_area());
});
});
@@ -78,7 +78,7 @@ fn criterion_benchmark(c: &mut Criterion) {
bencher.iter(|| {
let wkb_geom = wkb::reader::read_wkb(&wkb_bytes).unwrap();
let geom = wkb_geom.to_geometry();
- criterion::black_box(geom.signed_area());
+ std::hint::black_box(geom.signed_area());
});
});
}
diff --git a/rust/sedona-geo-generic-alg/benches/centroid.rs
b/rust/sedona-geo-generic-alg/benches/centroid.rs
index 62d7c033..7741a5c0 100644
--- a/rust/sedona-geo-generic-alg/benches/centroid.rs
+++ b/rust/sedona-geo-generic-alg/benches/centroid.rs
@@ -28,7 +28,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let polygon = Polygon::new(norway, vec![]);
bencher.iter(|| {
- criterion::black_box(criterion::black_box(&polygon).centroid());
+ std::hint::black_box(std::hint::black_box(&polygon).centroid());
});
});
@@ -37,7 +37,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let polygon = Polygon::new(norway, vec![]);
bencher.iter(|| {
- criterion::black_box(criterion::black_box(&polygon).centroid());
+ std::hint::black_box(std::hint::black_box(&polygon).centroid());
});
});
@@ -46,7 +46,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let polygon = Polygon::new(norway, vec![]);
bencher.iter(|| {
-
criterion::black_box(geo::Centroid::centroid(criterion::black_box(&polygon)));
+
std::hint::black_box(geo::Centroid::centroid(std::hint::black_box(&polygon)));
});
});
@@ -55,7 +55,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let polygon = Polygon::new(norway, vec![]);
bencher.iter(|| {
-
criterion::black_box(geo::Centroid::centroid(criterion::black_box(&polygon)));
+
std::hint::black_box(geo::Centroid::centroid(std::hint::black_box(&polygon)));
});
});
@@ -66,7 +66,7 @@ fn criterion_benchmark(c: &mut Criterion) {
bencher.iter(|| {
let wkb_geom = wkb::reader::read_wkb(&wkb_bytes).unwrap();
- criterion::black_box(wkb_geom.centroid());
+ std::hint::black_box(wkb_geom.centroid());
});
});
@@ -78,7 +78,7 @@ fn criterion_benchmark(c: &mut Criterion) {
bencher.iter(|| {
let wkb_geom = wkb::reader::read_wkb(&wkb_bytes).unwrap();
let geom = wkb_geom.to_geometry();
- criterion::black_box(geom.centroid());
+ std::hint::black_box(geom.centroid());
});
});
}
diff --git a/rust/sedona-geo-generic-alg/benches/distance.rs
b/rust/sedona-geo-generic-alg/benches/distance.rs
index 313e4cf7..46949e41 100644
--- a/rust/sedona-geo-generic-alg/benches/distance.rs
+++ b/rust/sedona-geo-generic-alg/benches/distance.rs
@@ -74,7 +74,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let p2 = Point::new(100.0, 100.0);
bencher.iter(|| {
-
criterion::black_box(criterion::black_box(&p1).distance_ext(criterion::black_box(&p2)));
+
std::hint::black_box(std::hint::black_box(&p1).distance_ext(std::hint::black_box(&p2)));
});
});
@@ -87,8 +87,8 @@ fn criterion_benchmark(c: &mut Criterion) {
]);
bencher.iter(|| {
- criterion::black_box(
-
criterion::black_box(&ls1).distance_ext(criterion::black_box(&ls2)),
+ std::hint::black_box(
+
std::hint::black_box(&ls1).distance_ext(std::hint::black_box(&ls2)),
);
});
});
@@ -116,8 +116,8 @@ fn criterion_benchmark(c: &mut Criterion) {
);
bencher.iter(|| {
- criterion::black_box(
-
criterion::black_box(&poly1).distance_ext(criterion::black_box(&poly2)),
+ std::hint::black_box(
+
std::hint::black_box(&poly1).distance_ext(std::hint::black_box(&poly2)),
);
});
});
@@ -131,7 +131,7 @@ fn criterion_benchmark(c: &mut Criterion) {
bencher.iter(|| {
let wkb_geom1 = wkb::reader::read_wkb(&wkb_bytes1).unwrap();
let wkb_geom2 = wkb::reader::read_wkb(&wkb_bytes2).unwrap();
- criterion::black_box(wkb_geom1.distance_ext(&wkb_geom2));
+ std::hint::black_box(wkb_geom1.distance_ext(&wkb_geom2));
});
});
@@ -148,7 +148,7 @@ fn criterion_benchmark(c: &mut Criterion) {
bencher.iter(|| {
let wkb_geom1 = wkb::reader::read_wkb(&wkb_bytes1).unwrap();
let wkb_geom2 = wkb::reader::read_wkb(&wkb_bytes2).unwrap();
- criterion::black_box(wkb_geom1.distance_ext(&wkb_geom2));
+ std::hint::black_box(wkb_geom1.distance_ext(&wkb_geom2));
});
});
@@ -177,8 +177,8 @@ fn criterion_benchmark(c: &mut Criterion) {
let mp2 = MultiPolygon::new(vec![poly2.clone(), poly2]);
bencher.iter(|| {
- criterion::black_box(
-
criterion::black_box(&mp1).distance_ext(criterion::black_box(&mp2)),
+ std::hint::black_box(
+
std::hint::black_box(&mp1).distance_ext(std::hint::black_box(&mp2)),
);
});
});
@@ -188,8 +188,8 @@ fn criterion_benchmark(c: &mut Criterion) {
let p2 = Point::new(100.0, 100.0);
bencher.iter(|| {
- criterion::black_box(
- Euclidean.distance(criterion::black_box(p1),
criterion::black_box(p2)),
+ std::hint::black_box(
+ Euclidean.distance(std::hint::black_box(p1),
std::hint::black_box(p2)),
);
});
});
@@ -203,8 +203,8 @@ fn criterion_benchmark(c: &mut Criterion) {
]);
bencher.iter(|| {
- criterion::black_box(
- geo::Euclidean.distance(criterion::black_box(&ls1),
criterion::black_box(&ls2)),
+ std::hint::black_box(
+ geo::Euclidean.distance(std::hint::black_box(&ls1),
std::hint::black_box(&ls2)),
);
});
});
@@ -218,9 +218,9 @@ fn criterion_benchmark(c: &mut Criterion) {
]);
bencher.iter(|| {
- criterion::black_box(Euclidean.distance(
- criterion::black_box(&point),
- criterion::black_box(&linestring),
+ std::hint::black_box(Euclidean.distance(
+ std::hint::black_box(&point),
+ std::hint::black_box(&linestring),
));
});
});
@@ -240,9 +240,9 @@ fn criterion_benchmark(c: &mut Criterion) {
);
bencher.iter(|| {
- criterion::black_box(Euclidean.distance(
- criterion::black_box(&linestring),
- criterion::black_box(&polygon),
+ std::hint::black_box(Euclidean.distance(
+ std::hint::black_box(&linestring),
+ std::hint::black_box(&polygon),
));
});
});
@@ -261,8 +261,8 @@ fn criterion_benchmark(c: &mut Criterion) {
);
bencher.iter(|| {
- criterion::black_box(
- Euclidean.distance(criterion::black_box(&point),
criterion::black_box(&polygon)),
+ std::hint::black_box(
+ Euclidean.distance(std::hint::black_box(&point),
std::hint::black_box(&polygon)),
);
});
});
@@ -298,8 +298,8 @@ fn criterion_benchmark(c: &mut Criterion) {
bencher.iter(|| {
// Generic implementation
- criterion::black_box(
-
criterion::black_box(&poly1).distance_ext(criterion::black_box(&poly2)),
+ std::hint::black_box(
+
std::hint::black_box(&poly1).distance_ext(std::hint::black_box(&poly2)),
);
});
},
@@ -331,8 +331,8 @@ fn criterion_benchmark(c: &mut Criterion) {
bencher.iter(|| {
// Concrete implementation
- criterion::black_box(
- Euclidean.distance(criterion::black_box(&poly1),
criterion::black_box(&poly2)),
+ std::hint::black_box(
+ Euclidean.distance(std::hint::black_box(&poly1),
std::hint::black_box(&poly2)),
);
});
},
@@ -369,9 +369,9 @@ fn criterion_benchmark(c: &mut Criterion) {
);
bencher.iter(|| {
- criterion::black_box(
- criterion::black_box(&poly_with_hole)
- .distance_ext(criterion::black_box(&small_poly)),
+ std::hint::black_box(
+ std::hint::black_box(&poly_with_hole)
+ .distance_ext(std::hint::black_box(&small_poly)),
);
});
});
@@ -404,9 +404,9 @@ fn criterion_benchmark(c: &mut Criterion) {
);
bencher.iter(|| {
- criterion::black_box(Euclidean.distance(
- criterion::black_box(&poly_with_hole),
- criterion::black_box(&small_poly),
+ std::hint::black_box(Euclidean.distance(
+ std::hint::black_box(&poly_with_hole),
+ std::hint::black_box(&small_poly),
));
});
});
@@ -417,9 +417,9 @@ fn criterion_benchmark(c: &mut Criterion) {
let complex_poly2 = create_complex_polygon(100.0, 100.0, 30.0, 15); //
15 vertices
bencher.iter(|| {
- criterion::black_box(
- criterion::black_box(&complex_poly1)
- .distance_ext(criterion::black_box(&complex_poly2)),
+ std::hint::black_box(
+ std::hint::black_box(&complex_poly1)
+ .distance_ext(std::hint::black_box(&complex_poly2)),
);
});
});
@@ -429,9 +429,9 @@ fn criterion_benchmark(c: &mut Criterion) {
let complex_poly2 = create_complex_polygon(100.0, 100.0, 30.0, 15);
bencher.iter(|| {
- criterion::black_box(Euclidean.distance(
- criterion::black_box(&complex_poly1),
- criterion::black_box(&complex_poly2),
+ std::hint::black_box(Euclidean.distance(
+ std::hint::black_box(&complex_poly1),
+ std::hint::black_box(&complex_poly2),
));
});
});
@@ -454,9 +454,9 @@ fn criterion_benchmark(c: &mut Criterion) {
]);
bencher.iter(|| {
- criterion::black_box(
- criterion::black_box(&intersecting_linestring)
- .distance_ext(criterion::black_box(&polygon)),
+ std::hint::black_box(
+ std::hint::black_box(&intersecting_linestring)
+ .distance_ext(std::hint::black_box(&polygon)),
);
});
});
@@ -476,9 +476,9 @@ fn criterion_benchmark(c: &mut Criterion) {
LineString::from(vec![coord!(x: -50.0, y: 50.0), coord!(x: 150.0,
y: 50.0)]);
bencher.iter(|| {
- criterion::black_box(Euclidean.distance(
- criterion::black_box(&intersecting_linestring),
- criterion::black_box(&polygon),
+ std::hint::black_box(Euclidean.distance(
+ std::hint::black_box(&intersecting_linestring),
+ std::hint::black_box(&polygon),
));
});
});
@@ -489,8 +489,8 @@ fn criterion_benchmark(c: &mut Criterion) {
let mp2 = create_multipolygon(3); // 3 polygons
bencher.iter(|| {
- criterion::black_box(
-
criterion::black_box(&mp1).distance_ext(criterion::black_box(&mp2)),
+ std::hint::black_box(
+
std::hint::black_box(&mp1).distance_ext(std::hint::black_box(&mp2)),
);
});
});
@@ -500,8 +500,8 @@ fn criterion_benchmark(c: &mut Criterion) {
let mp2 = create_multipolygon(3);
bencher.iter(|| {
- criterion::black_box(
- Euclidean.distance(criterion::black_box(&mp1),
criterion::black_box(&mp2)),
+ std::hint::black_box(
+ Euclidean.distance(std::hint::black_box(&mp1),
std::hint::black_box(&mp2)),
);
});
});
diff --git a/rust/sedona-geo-generic-alg/benches/intersection.rs
b/rust/sedona-geo-generic-alg/benches/intersection.rs
index d981ac38..a544155b 100644
--- a/rust/sedona-geo-generic-alg/benches/intersection.rs
+++ b/rust/sedona-geo-generic-alg/benches/intersection.rs
@@ -37,7 +37,7 @@ fn multi_polygon_intersection(c: &mut Criterion) {
for a in &plot_geoms {
for b in &zone_geoms {
- if criterion::black_box(b.intersects(a)) {
+ if std::hint::black_box(b.intersects(a)) {
intersects += 1;
} else {
non_intersects += 1;
@@ -57,7 +57,7 @@ fn multi_polygon_intersection(c: &mut Criterion) {
for a in &plot_geoms {
for b in &zone_geoms {
- if criterion::black_box(a.intersects(b)) {
+ if std::hint::black_box(a.intersects(b)) {
intersects += 1;
} else {
non_intersects += 1;
@@ -77,7 +77,7 @@ fn multi_polygon_intersection(c: &mut Criterion) {
for a in &plot_geoms {
for b in &zone_geoms {
- if criterion::black_box(geo::Intersects::intersects(b, a))
{
+ if std::hint::black_box(geo::Intersects::intersects(b, a))
{
intersects += 1;
} else {
non_intersects += 1;
@@ -97,7 +97,7 @@ fn multi_polygon_intersection(c: &mut Criterion) {
for a in &plot_geoms {
for b in &zone_geoms {
- if criterion::black_box(geo::Intersects::intersects(a, b))
{
+ if std::hint::black_box(geo::Intersects::intersects(a, b))
{
intersects += 1;
} else {
non_intersects += 1;
@@ -134,7 +134,7 @@ fn multi_polygon_intersection_wkb(c: &mut Criterion) {
for b in &zone_polygon_wkbs {
let a_geom = wkb::reader::read_wkb(a).unwrap(); // Skip
padding
let b_geom = wkb::reader::read_wkb(b).unwrap(); // Skip
padding
- if criterion::black_box(b_geom.intersects(&a_geom)) {
+ if std::hint::black_box(b_geom.intersects(&a_geom)) {
intersects += 1;
} else {
non_intersects += 1;
@@ -175,7 +175,7 @@ fn multi_polygon_intersection_wkb_aligned(c: &mut
Criterion) {
for b in &zone_polygon_wkbs {
let a_geom = wkb::reader::read_wkb(&a[3..]).unwrap(); //
Skip padding
let b_geom = wkb::reader::read_wkb(&b[3..]).unwrap(); //
Skip padding
- if criterion::black_box(b_geom.intersects(&a_geom)) {
+ if std::hint::black_box(b_geom.intersects(&a_geom)) {
intersects += 1;
} else {
non_intersects += 1;
@@ -214,7 +214,7 @@ fn multi_polygon_intersection_wkb_conv(c: &mut Criterion) {
let b_geom = wkb::reader::read_wkb(b).unwrap();
let a_geom = a_geom.to_geometry();
let b_geom = b_geom.to_geometry();
- if criterion::black_box(b_geom.intersects(&a_geom)) {
+ if std::hint::black_box(b_geom.intersects(&a_geom)) {
intersects += 1;
} else {
non_intersects += 1;
@@ -244,7 +244,7 @@ fn point_polygon_intersection(c: &mut Criterion) {
bencher.iter(|| {
for a in &plot_geoms {
for b in &zone_geoms {
- criterion::black_box(b.intersects(a));
+ std::hint::black_box(b.intersects(a));
}
}
});
@@ -254,7 +254,7 @@ fn point_polygon_intersection(c: &mut Criterion) {
bencher.iter(|| {
for a in &plot_geoms {
for b in &zone_geoms {
- criterion::black_box(geo::Intersects::intersects(b, a));
+ std::hint::black_box(geo::Intersects::intersects(b, a));
}
}
});
@@ -282,7 +282,7 @@ fn point_polygon_intersection_wkb(c: &mut Criterion) {
for b in &zone_polygon_wkbs {
let a_geom = wkb::reader::read_wkb(a).unwrap();
let b_geom = wkb::reader::read_wkb(b).unwrap();
- criterion::black_box(b_geom.intersects(&a_geom));
+ std::hint::black_box(b_geom.intersects(&a_geom));
}
}
});
@@ -312,7 +312,7 @@ fn point_polygon_intersection_wkb_conv(c: &mut Criterion) {
let b_geom = wkb::reader::read_wkb(b).unwrap();
let a_geom = a_geom.to_geometry();
let b_geom = b_geom.to_geometry();
- criterion::black_box(b_geom.intersects(&a_geom));
+ std::hint::black_box(b_geom.intersects(&a_geom));
}
}
});
@@ -338,7 +338,7 @@ fn rect_intersection(c: &mut Criterion) {
for a in &plot_bbox {
for b in &zone_bbox {
- if criterion::black_box(a.intersects(b)) {
+ if std::hint::black_box(a.intersects(b)) {
intersects += 1;
} else {
non_intersects += 1;
@@ -371,7 +371,7 @@ fn point_rect_intersection(c: &mut Criterion) {
for a in &plot_centroids {
for b in &zone_bbox {
- if criterion::black_box(a.intersects(b)) {
+ if std::hint::black_box(a.intersects(b)) {
intersects += 1;
} else {
non_intersects += 1;
@@ -404,7 +404,7 @@ fn point_triangle_intersection(c: &mut Criterion) {
for a in &plot_centroids {
for b in &zone_triangles {
- if criterion::black_box(a.intersects(b)) {
+ if std::hint::black_box(a.intersects(b)) {
intersects += 1;
} else {
non_intersects += 1;
@@ -422,7 +422,7 @@ fn point_triangle_intersection(c: &mut Criterion) {
let point = Point::new(5., 5.);
bencher.iter(|| {
-
assert!(criterion::black_box(&triangle).intersects(criterion::black_box(&point)));
+
assert!(std::hint::black_box(&triangle).intersects(std::hint::black_box(&point)));
});
});
@@ -431,7 +431,7 @@ fn point_triangle_intersection(c: &mut Criterion) {
let point = Point::new(3., 5.);
bencher.iter(|| {
-
assert!(criterion::black_box(&triangle).intersects(criterion::black_box(&point)));
+
assert!(std::hint::black_box(&triangle).intersects(std::hint::black_box(&point)));
});
});
}
@@ -454,7 +454,7 @@ fn linestring_polygon_intersection(c: &mut Criterion) {
);
bencher.iter(|| {
-
assert!(!criterion::black_box(&ls).intersects(criterion::black_box(&poly)));
+
assert!(!std::hint::black_box(&ls).intersects(std::hint::black_box(&poly)));
});
});
c.bench_function("LineString above Triangle", |bencher| {
@@ -470,7 +470,7 @@ fn linestring_polygon_intersection(c: &mut Criterion) {
);
bencher.iter(|| {
-
assert!(!criterion::black_box(&ls).intersects(criterion::black_box(&poly)));
+
assert!(!std::hint::black_box(&ls).intersects(std::hint::black_box(&poly)));
});
});
c.bench_function("LineString around Rectangle", |bencher| {
@@ -482,7 +482,7 @@ fn linestring_polygon_intersection(c: &mut Criterion) {
let poly = Rect::new(coord! {x:0., y:0.}, coord! {x:10., y:10.});
bencher.iter(|| {
-
assert!(!criterion::black_box(&ls).intersects(criterion::black_box(&poly)));
+
assert!(!std::hint::black_box(&ls).intersects(std::hint::black_box(&poly)));
});
});
@@ -495,7 +495,7 @@ fn linestring_polygon_intersection(c: &mut Criterion) {
let poly = Polygon::new(LineString::from_iter(ext), vec![]);
bencher.iter(|| {
-
assert!(!criterion::black_box(&ls).intersects(criterion::black_box(&poly)));
+
assert!(!std::hint::black_box(&ls).intersects(std::hint::black_box(&poly)));
});
});
@@ -509,7 +509,7 @@ fn linestring_polygon_intersection(c: &mut Criterion) {
let poly: Polygon = Rect::new(coord! {x:0., y:0.}, coord! {x:10.,
y:10.}).into();
bencher.iter(|| {
-
assert!(criterion::black_box(&ls).intersects(criterion::black_box(&poly)));
+
assert!(std::hint::black_box(&ls).intersects(std::hint::black_box(&poly)));
});
});
c.bench_function("ls within rect ", |bencher| {
@@ -522,7 +522,7 @@ fn linestring_polygon_intersection(c: &mut Criterion) {
let poly = Rect::new(coord! {x:0., y:0.}, coord! {x:10., y:10.});
bencher.iter(|| {
-
assert!(criterion::black_box(&ls).intersects(criterion::black_box(&poly)));
+
assert!(std::hint::black_box(&ls).intersects(std::hint::black_box(&poly)));
});
});
}
diff --git a/rust/sedona-geo-generic-alg/benches/length.rs
b/rust/sedona-geo-generic-alg/benches/length.rs
index 24970d06..4ddd94cf 100644
--- a/rust/sedona-geo-generic-alg/benches/length.rs
+++ b/rust/sedona-geo-generic-alg/benches/length.rs
@@ -26,7 +26,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let linestring = sedona_testing::fixtures::norway_main::<f32>();
bencher.iter(|| {
-
criterion::black_box(criterion::black_box(&linestring).length_ext(&Euclidean));
+
std::hint::black_box(std::hint::black_box(&linestring).length_ext(&Euclidean));
});
});
@@ -34,7 +34,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let linestring = sedona_testing::fixtures::norway_main::<f64>();
bencher.iter(|| {
-
criterion::black_box(criterion::black_box(&linestring).length_ext(&Euclidean));
+
std::hint::black_box(std::hint::black_box(&linestring).length_ext(&Euclidean));
});
});
@@ -44,7 +44,7 @@ fn criterion_benchmark(c: &mut Criterion) {
bencher.iter(|| {
let wkb_geom = wkb::reader::read_wkb(&wkb_bytes).unwrap();
- criterion::black_box(wkb_geom.length_ext(&Euclidean));
+ std::hint::black_box(wkb_geom.length_ext(&Euclidean));
});
});
@@ -55,7 +55,7 @@ fn criterion_benchmark(c: &mut Criterion) {
bencher.iter(|| {
let wkb_geom = wkb::reader::read_wkb(&wkb_bytes).unwrap();
let geom = wkb_geom.to_geometry();
- criterion::black_box(geom.length_ext(&Euclidean));
+ std::hint::black_box(geom.length_ext(&Euclidean));
});
});
}
diff --git a/rust/sedona-geo-generic-alg/benches/perimeter.rs
b/rust/sedona-geo-generic-alg/benches/perimeter.rs
index 95d9e0a3..85b20ec7 100644
--- a/rust/sedona-geo-generic-alg/benches/perimeter.rs
+++ b/rust/sedona-geo-generic-alg/benches/perimeter.rs
@@ -28,7 +28,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let polygon = Polygon::new(norway, vec![]);
bencher.iter(|| {
-
criterion::black_box(criterion::black_box(&polygon).perimeter_ext(&Euclidean));
+
std::hint::black_box(std::hint::black_box(&polygon).perimeter_ext(&Euclidean));
});
});
@@ -37,7 +37,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let polygon = Polygon::new(norway, vec![]);
bencher.iter(|| {
-
criterion::black_box(criterion::black_box(&polygon).perimeter_ext(&Euclidean));
+
std::hint::black_box(std::hint::black_box(&polygon).perimeter_ext(&Euclidean));
});
});
@@ -48,7 +48,7 @@ fn criterion_benchmark(c: &mut Criterion) {
bencher.iter(|| {
let wkb_geom = wkb::reader::read_wkb(&wkb_bytes).unwrap();
- criterion::black_box(wkb_geom.perimeter_ext(&Euclidean));
+ std::hint::black_box(wkb_geom.perimeter_ext(&Euclidean));
});
});
@@ -60,7 +60,7 @@ fn criterion_benchmark(c: &mut Criterion) {
bencher.iter(|| {
let wkb_geom = wkb::reader::read_wkb(&wkb_bytes).unwrap();
let geom = wkb_geom.to_geometry();
- criterion::black_box(geom.perimeter_ext(&Euclidean));
+ std::hint::black_box(geom.perimeter_ext(&Euclidean));
});
});
}
