Expect Instance in handle_model

crates/fj/src/handle_model.rs

@@ -6,8 +6,8 @@ use fj_core::{
         bounding_volume::BoundingVolume,
         triangulate::Triangulate,
     },
-    services::Services,
     validate::ValidationErrors,
+    Instance,
 };
 use fj_interop::Model;
 use fj_math::{Aabb, Point, Scalar};
@@ -23,7 +23,7 @@ use crate::Args;
 ///
 /// This function is used by Fornjot's own testing infrastructure, but is useful
 /// beyond that, when using Fornjot directly to define a model.
-pub fn handle_model<M>(model: &M, services: Services) -> Result
+pub fn handle_model<M>(model: &M, core: Instance) -> Result
 where
     for<'r> (&'r M, Tolerance): Triangulate,
     M: BoundingVolume<3>,
@@ -36,9 +36,9 @@ where
     let args = Args::parse();
 
     if args.ignore_validation {
-        mem::forget(services);
+        mem::forget(core);
     } else {
-        services.drop_and_validate()?;
+        core.services.drop_and_validate()?;
     }
 
     let aabb = model.aabb().unwrap_or(Aabb {

models/all/src/main.rs

@@ -3,6 +3,6 @@ use fj::handle_model;
 fn main() -> fj::Result {
     let mut core = fj::core::Instance::new();
     let model = all::model(&mut core);
-    handle_model(&model, core.services)?;
+    handle_model(&model, core)?;
     Ok(())
 }

models/color/src/main.rs

@@ -3,6 +3,6 @@ use fj::handle_model;
 fn main() -> fj::Result {
     let mut core = fj::core::Instance::new();
     let model = color::model(&mut core);
-    handle_model(&model, core.services)?;
+    handle_model(&model, core)?;
     Ok(())
 }

models/cuboid/src/main.rs

@@ -3,6 +3,6 @@ use fj::handle_model;
 fn main() -> fj::Result {
     let mut core = fj::core::Instance::new();
     let model = cuboid::model([3., 2., 1.], &mut core);
-    handle_model(&model, core.services)?;
+    handle_model(&model, core)?;
     Ok(())
 }

models/holes/src/main.rs

@@ -3,6 +3,6 @@ use fj::handle_model;
 fn main() -> fj::Result {
     let mut core = fj::core::Instance::new();
     let model = holes::model(0.25, &mut core);
-    handle_model(&model, core.services)?;
+    handle_model(&model, core)?;
     Ok(())
 }

models/spacer/src/main.rs

@@ -3,6 +3,6 @@ use fj::handle_model;
 fn main() -> fj::Result {
     let mut core = fj::core::Instance::new();
     let model = spacer::model(1., 0.5, 1., &mut core);
-    handle_model(&model, core.services)?;
+    handle_model(&model, core)?;
     Ok(())
 }

models/split/src/main.rs

@@ -3,6 +3,6 @@ use fj::handle_model;
 fn main() -> fj::Result {
     let mut core = fj::core::Instance::new();
     let model = split::model(1.0, 0.2, &mut core);
-    handle_model(&model, core.services)?;
+    handle_model(&model, core)?;
     Ok(())
 }

models/star/src/main.rs

@@ -3,6 +3,6 @@ use fj::handle_model;
 fn main() -> fj::Result {
     let mut core = fj::core::Instance::new();
     let model = star::model(5, 1., 2., 1., &mut core);
-    handle_model(&model, core.services)?;
+    handle_model(&model, core)?;
     Ok(())
 }

models/vertices-indices/src/main.rs

@@ -3,6 +3,6 @@ use fj::handle_model;
 fn main() -> fj::Result {
     let mut core = fj::core::Instance::new();
     let model = vertices_indices::model(&mut core);
-    handle_model(&model, core.services)?;
+    handle_model(&model, core)?;
     Ok(())
 }