Skip to content

Commit 69ceeae

Browse files
Remove global use of nextafter or work_share.
1 parent eaecd83 commit 69ceeae

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

src/algorithms/hilbert_curve.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use crate::geometry::OrientedBoundingBox;
1414
use crate::Point2D;
1515
use rayon::prelude::*;
1616
use std::fmt;
17+
use crate::nextafter::nextafter;
1718

1819
fn hilbert_curve_partition(
1920
partition: &mut [usize],
@@ -91,7 +92,7 @@ fn segment_to_segment(min: f64, max: f64, order: usize) -> impl Fn(f64) -> u64 {
9192

9293
// Map max to (2**order-1).
9394
while n <= width * f {
94-
f = crate::nextafter(f, 0.0);
95+
f = nextafter(f, 0.0);
9596
}
9697

9798
move |v| {
@@ -362,13 +363,13 @@ mod tests {
362363
assert_eq!(mapping(7.0), 6);
363364
assert_eq!(mapping(8.0), 7);
364365

365-
assert_eq!(mapping(crate::nextafter(1.0, f64::INFINITY)), 1);
366-
assert_eq!(mapping(crate::nextafter(2.0, f64::INFINITY)), 2);
367-
assert_eq!(mapping(crate::nextafter(3.0, f64::INFINITY)), 3);
368-
assert_eq!(mapping(crate::nextafter(4.0, f64::INFINITY)), 4);
369-
assert_eq!(mapping(crate::nextafter(5.0, f64::INFINITY)), 5);
370-
assert_eq!(mapping(crate::nextafter(6.0, f64::INFINITY)), 6);
371-
assert_eq!(mapping(crate::nextafter(7.0, f64::INFINITY)), 7);
366+
assert_eq!(mapping(nextafter(1.0, f64::INFINITY)), 1);
367+
assert_eq!(mapping(nextafter(2.0, f64::INFINITY)), 2);
368+
assert_eq!(mapping(nextafter(3.0, f64::INFINITY)), 3);
369+
assert_eq!(mapping(nextafter(4.0, f64::INFINITY)), 4);
370+
assert_eq!(mapping(nextafter(5.0, f64::INFINITY)), 5);
371+
assert_eq!(mapping(nextafter(6.0, f64::INFINITY)), 6);
372+
assert_eq!(mapping(nextafter(7.0, f64::INFINITY)), 7);
372373
}
373374

374375
#[test]

src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ pub use crate::algorithms::*;
9797
pub use crate::geometry::{BoundingBox, Point2D, Point3D, PointND};
9898
pub use crate::real::Real;
9999

100-
// Internal use
101-
use crate::nextafter::nextafter;
102-
use crate::work_share::work_share;
103100
use std::cmp::Ordering;
104101

105102
/// The `Partition` trait allows for partitioning data.

0 commit comments

Comments
 (0)