switch from OnceCell to OnceLock so that parallel builds continue to work

timschmidt · timschmidt · commit 11f71fc29cb1 · 2025-05-21T22:26:18.000-04:00
diff --git a/src/csg.rs b/src/csg.rs
@@ -19,7 +19,7 @@ use crate::float_types::parry3d::{
 };
 use crate::float_types::rapier3d::prelude::*;
 use std::fmt::Debug;
-use std::cell::OnceCell;
+use std::sync::OnceLock;
 
 #[cfg(feature = "parallel")]
 use rayon::prelude::*;
@@ -37,7 +37,7 @@ pub struct CSG<S: Clone> {
     pub geometry: GeometryCollection<Real>,
     
     /// Lazily calculated AABB that spans `polygons` **and** any 2‑D geometry.
-    pub bounding_box: OnceCell<Aabb>,
+    pub bounding_box: OnceLock<Aabb>,
 
     /// Metadata
     pub metadata: Option<S>,
@@ -49,7 +49,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {
         CSG {
             polygons: Vec::new(),
             geometry: GeometryCollection::default(),
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata: None,
         }
     }
@@ -313,7 +313,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {
         CSG {
             polygons: final_polys,
             geometry: final_gc,
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata: self.metadata.clone(),
         }
     }
@@ -378,7 +378,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {
         CSG {
             polygons: a.all_polygons(),
             geometry: final_gc,
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata: self.metadata.clone(),
         }
     }
@@ -443,7 +443,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {
         CSG {
             polygons: a.all_polygons(),
             geometry: final_gc,
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata: self.metadata.clone(),
         }
     }
@@ -575,7 +575,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {
         csg.geometry = csg.geometry.affine_transform(&affine2);
         
         // invalidate the old cached bounding box
-        csg.bounding_box = OnceCell::new();
+        csg.bounding_box = OnceLock::new();
 
         csg
     }
@@ -730,7 +730,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {
         CSG {
             polygons: all_csg.polygons,
             geometry: all_csg.geometry,
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata: self.metadata.clone(),
         }
     }
@@ -765,7 +765,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {
         CSG {
             polygons: all_csg.polygons,
             geometry: all_csg.geometry,
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata: self.metadata.clone(),
         }
     }
@@ -796,7 +796,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {
         CSG {
             polygons: all_csg.polygons,
             geometry: all_csg.geometry,
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata: self.metadata.clone(),
         }
     }
diff --git a/src/extrudes.rs b/src/extrudes.rs
@@ -5,7 +5,7 @@ use crate::vertex::Vertex;
 use geo::{Area, CoordsIter, GeometryCollection, LineString, Polygon as GeoPolygon};
 use nalgebra::{Point3, Vector3};
 use std::fmt::Debug;
-use std::cell::OnceCell;
+use std::sync::OnceLock;
 
 impl<S: Clone + Debug> CSG<S>
 where S: Clone + Send + Sync {
@@ -183,7 +183,7 @@ where S: Clone + Send + Sync {
         CSG {
             polygons: final_polygons,
             geometry: self.geometry.clone(),
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata: self.metadata.clone(),
         }
     }
@@ -692,7 +692,7 @@ where S: Clone + Send + Sync {
         CSG {
             polygons: new_polygons,
             geometry: GeometryCollection::default(),
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata: self.metadata.clone(),
         }
     }
diff --git a/src/flatten_slice.rs b/src/flatten_slice.rs
@@ -10,7 +10,7 @@ use geo::{
 use hashbrown::HashMap;
 use nalgebra::Point3;
 use std::fmt::Debug;
-use std::cell::OnceCell;
+use std::sync::OnceLock;
 use small_str::{ format_smallstr, SmallStr };
 
 impl<S: Clone + Debug> CSG<S>
@@ -76,7 +76,7 @@ where S: Clone + Send + Sync {
         CSG {
             polygons: Vec::new(),
             geometry: new_gc,
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata: self.metadata.clone(),
         }
     }
@@ -158,7 +158,7 @@ where S: Clone + Send + Sync {
         CSG {
             polygons: Vec::new(),
             geometry: new_gc,
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata: self.metadata.clone(),
         }
     }
diff --git a/src/offset.rs b/src/offset.rs
@@ -3,7 +3,7 @@ use crate::float_types::Real;
 use geo::{Geometry, GeometryCollection};
 use geo_buf::{buffer_multi_polygon, buffer_polygon};
 use std::fmt::Debug;
-use std::cell::OnceCell;
+use std::sync::OnceLock;
 
 impl<S: Clone + Debug> CSG<S>
 where S: Clone + Send + Sync {
@@ -35,7 +35,7 @@ where S: Clone + Send + Sync {
         CSG {
             polygons: self.polygons.clone(),
             geometry: new_collection,
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata: self.metadata.clone(),
         }
     }
diff --git a/src/polygon.rs b/src/polygon.rs
@@ -4,7 +4,7 @@ use crate::vertex::Vertex;
 use geo::{LineString, Polygon as GeoPolygon, coord};
 use nalgebra::{Point2, Point3, Vector3};
 use crate::float_types::parry3d::bounding_volume::Aabb;
-use std::cell::OnceCell;
+use std::sync::OnceLock;
 
 /// A polygon, defined by a list of vertices.
 /// - `S` is the generic metadata type, stored as `Option<S>`.
@@ -17,7 +17,7 @@ pub struct Polygon<S: Clone> {
     pub plane: Plane,
     
     /// Lazily‑computed axis‑aligned bounding box of the Polygon
-    pub bounding_box: OnceCell<Aabb>,
+    pub bounding_box: OnceLock<Aabb>,
         
     /// Generic metadata associated with the Polygon
     pub metadata: Option<S>,
@@ -34,7 +34,7 @@ where S: Clone + Send + Sync {
         Polygon {
             vertices,
             plane,
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata,
         }
     }
diff --git a/src/shapes2d.rs b/src/shapes2d.rs
@@ -2,7 +2,7 @@ use crate::csg::CSG;
 use crate::float_types::{Real, PI, EPSILON, FRAC_PI_2, TAU};
 use geo::{line_string, GeometryCollection, Geometry, LineString, MultiPolygon, Polygon as GeoPolygon, BooleanOps, Orient, orient::Direction};
 use std::fmt::Debug;
-use std::cell::OnceCell;
+use std::sync::OnceLock;
 
 impl<S: Clone + Debug> CSG<S>
 where S: Clone + Send + Sync {
@@ -449,7 +449,7 @@ where S: Clone + Send + Sync {
         CSG {
             geometry: shape.geometry,
             polygons: shape.polygons,
-            bounding_box: OnceCell::new(),
+            bounding_box: OnceLock::new(),
             metadata,
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ use crate::float_types::parry3d::{`
`19`	`19`	`};`
`20`	`20`	`use crate::float_types::rapier3d::prelude::*;`
`21`	`21`	`use std::fmt::Debug;`
`22`		`-use std::cell::OnceCell;`
	`22`	`+use std::sync::OnceLock;`
`23`	`23`
`24`	`24`	`#[cfg(feature = "parallel")]`
`25`	`25`	`use rayon::prelude::*;`
`@@ -37,7 +37,7 @@ pub struct CSG<S: Clone> {`
`37`	`37`	`pub geometry: GeometryCollection<Real>,`
`38`	`38`
`39`	`39`	/// Lazily calculated AABB that spans `polygons` and any 2‑D geometry.
`40`		`- pub bounding_box: OnceCell<Aabb>,`
	`40`	`+ pub bounding_box: OnceLock<Aabb>,`
`41`	`41`
`42`	`42`	`/// Metadata`
`43`	`43`	`pub metadata: Option<S>,`
`@@ -49,7 +49,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {`
`49`	`49`	`CSG {`
`50`	`50`	`polygons: Vec::new(),`
`51`	`51`	`geometry: GeometryCollection::default(),`
`52`		`- bounding_box: OnceCell::new(),`
	`52`	`+ bounding_box: OnceLock::new(),`
`53`	`53`	`metadata: None,`
`54`	`54`	`}`
`55`	`55`	`}`
`@@ -313,7 +313,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {`
`313`	`313`	`CSG {`
`314`	`314`	`polygons: final_polys,`
`315`	`315`	`geometry: final_gc,`
`316`		`- bounding_box: OnceCell::new(),`
	`316`	`+ bounding_box: OnceLock::new(),`
`317`	`317`	`metadata: self.metadata.clone(),`
`318`	`318`	`}`
`319`	`319`	`}`
`@@ -378,7 +378,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {`
`378`	`378`	`CSG {`
`379`	`379`	`polygons: a.all_polygons(),`
`380`	`380`	`geometry: final_gc,`
`381`		`- bounding_box: OnceCell::new(),`
	`381`	`+ bounding_box: OnceLock::new(),`
`382`	`382`	`metadata: self.metadata.clone(),`
`383`	`383`	`}`
`384`	`384`	`}`
`@@ -443,7 +443,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {`
`443`	`443`	`CSG {`
`444`	`444`	`polygons: a.all_polygons(),`
`445`	`445`	`geometry: final_gc,`
`446`		`- bounding_box: OnceCell::new(),`
	`446`	`+ bounding_box: OnceLock::new(),`
`447`	`447`	`metadata: self.metadata.clone(),`
`448`	`448`	`}`
`449`	`449`	`}`
`@@ -575,7 +575,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {`
`575`	`575`	`csg.geometry = csg.geometry.affine_transform(&affine2);`
`576`	`576`
`577`	`577`	`// invalidate the old cached bounding box`
`578`		`- csg.bounding_box = OnceCell::new();`
	`578`	`+ csg.bounding_box = OnceLock::new();`
`579`	`579`
`580`	`580`	`csg`
`581`	`581`	`}`
`@@ -730,7 +730,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {`
`730`	`730`	`CSG {`
`731`	`731`	`polygons: all_csg.polygons,`
`732`	`732`	`geometry: all_csg.geometry,`
`733`		`- bounding_box: OnceCell::new(),`
	`733`	`+ bounding_box: OnceLock::new(),`
`734`	`734`	`metadata: self.metadata.clone(),`
`735`	`735`	`}`
`736`	`736`	`}`
`@@ -765,7 +765,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {`
`765`	`765`	`CSG {`
`766`	`766`	`polygons: all_csg.polygons,`
`767`	`767`	`geometry: all_csg.geometry,`
`768`		`- bounding_box: OnceCell::new(),`
	`768`	`+ bounding_box: OnceLock::new(),`
`769`	`769`	`metadata: self.metadata.clone(),`
`770`	`770`	`}`
`771`	`771`	`}`
`@@ -796,7 +796,7 @@ impl<S: Clone + Debug + Send + Sync> CSG<S> {`
`796`	`796`	`CSG {`
`797`	`797`	`polygons: all_csg.polygons,`
`798`	`798`	`geometry: all_csg.geometry,`
`799`		`- bounding_box: OnceCell::new(),`
	`799`	`+ bounding_box: OnceLock::new(),`
`800`	`800`	`metadata: self.metadata.clone(),`
`801`	`801`	`}`
`802`	`802`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ use crate::vertex::Vertex;`
`5`	`5`	`use geo::{Area, CoordsIter, GeometryCollection, LineString, Polygon as GeoPolygon};`
`6`	`6`	`use nalgebra::{Point3, Vector3};`
`7`	`7`	`use std::fmt::Debug;`
`8`		`-use std::cell::OnceCell;`
	`8`	`+use std::sync::OnceLock;`
`9`	`9`
`10`	`10`	`impl<S: Clone + Debug> CSG<S>`
`11`	`11`	`where S: Clone + Send + Sync {`
`@@ -183,7 +183,7 @@ where S: Clone + Send + Sync {`
`183`	`183`	`CSG {`
`184`	`184`	`polygons: final_polygons,`
`185`	`185`	`geometry: self.geometry.clone(),`
`186`		`- bounding_box: OnceCell::new(),`
	`186`	`+ bounding_box: OnceLock::new(),`
`187`	`187`	`metadata: self.metadata.clone(),`
`188`	`188`	`}`
`189`	`189`	`}`
`@@ -692,7 +692,7 @@ where S: Clone + Send + Sync {`
`692`	`692`	`CSG {`
`693`	`693`	`polygons: new_polygons,`
`694`	`694`	`geometry: GeometryCollection::default(),`
`695`		`- bounding_box: OnceCell::new(),`
	`695`	`+ bounding_box: OnceLock::new(),`
`696`	`696`	`metadata: self.metadata.clone(),`
`697`	`697`	`}`
`698`	`698`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ use geo::{`
`10`	`10`	`use hashbrown::HashMap;`
`11`	`11`	`use nalgebra::Point3;`
`12`	`12`	`use std::fmt::Debug;`
`13`		`-use std::cell::OnceCell;`
	`13`	`+use std::sync::OnceLock;`
`14`	`14`	`use small_str::{ format_smallstr, SmallStr };`
`15`	`15`
`16`	`16`	`impl<S: Clone + Debug> CSG<S>`
`@@ -76,7 +76,7 @@ where S: Clone + Send + Sync {`
`76`	`76`	`CSG {`
`77`	`77`	`polygons: Vec::new(),`
`78`	`78`	`geometry: new_gc,`
`79`		`- bounding_box: OnceCell::new(),`
	`79`	`+ bounding_box: OnceLock::new(),`
`80`	`80`	`metadata: self.metadata.clone(),`
`81`	`81`	`}`
`82`	`82`	`}`
`@@ -158,7 +158,7 @@ where S: Clone + Send + Sync {`
`158`	`158`	`CSG {`
`159`	`159`	`polygons: Vec::new(),`
`160`	`160`	`geometry: new_gc,`
`161`		`- bounding_box: OnceCell::new(),`
	`161`	`+ bounding_box: OnceLock::new(),`
`162`	`162`	`metadata: self.metadata.clone(),`
`163`	`163`	`}`
`164`	`164`	`}`