Merge pull request #2196 from hannobraun/instance

Expect `&mut Instance` in `JoinCycle::join_to`
hannobraun · Feb 6, 2024 · d6fb553 · d6fb553
2 parents 3e9de57 + e6c2bca
commit d6fb553
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/crates/fj-core/src/operations/build/shell.rs b/crates/fj-core/src/operations/build/shell.rs
@@ -162,7 +162,7 @@ pub trait BuildShell {
                             abc.face.region().exterior(),
                             0..=0,
                             0..=0,
-                            &mut core.services,
+                            core,
                         )
                         .insert(&mut core.services)
                 })
@@ -185,7 +185,7 @@ pub trait BuildShell {
                             abc.face.region().exterior(),
                             1..=1,
                             2..=2,
-                            &mut core.services,
+                            core,
                         )
                         .update_half_edge(
                             cycle.half_edges().nth_circular(0),
@@ -200,7 +200,7 @@ pub trait BuildShell {
                             bad.face.region().exterior(),
                             0..=0,
                             1..=1,
-                            &mut core.services,
+                            core,
                         )
                         .insert(&mut core.services)
                 })
@@ -241,19 +241,19 @@ pub trait BuildShell {
                             abc.face.region().exterior(),
                             0..=0,
                             1..=1,
-                            &mut core.services,
+                            core,
                         )
                         .join_to(
                             bad.face.region().exterior(),
                             1..=1,
                             2..=2,
-                            &mut core.services,
+                            core,
                         )
                         .join_to(
                             dac.face.region().exterior(),
                             2..=2,
                             2..=2,
-                            &mut core.services,
+                            core,
                         )
                         .insert(&mut core.services)
                 })

diff --git a/crates/fj-core/src/operations/join/cycle.rs b/crates/fj-core/src/operations/join/cycle.rs
@@ -11,7 +11,6 @@ use crate::{
         insert::Insert,
         update::{UpdateCycle, UpdateHalfEdge},
     },
-    services::Services,
     storage::Handle,
     Instance,
 };
@@ -74,7 +73,7 @@ pub trait JoinCycle {
         other: &Cycle,
         range: RangeInclusive<usize>,
         other_range: RangeInclusive<usize>,
-        services: &mut Services,
+        core: &mut Instance,
     ) -> Self;
 }
 
@@ -103,7 +102,7 @@ impl JoinCycle for Cycle {
         other: &Cycle,
         range: RangeInclusive<usize>,
         range_other: RangeInclusive<usize>,
-        services: &mut Services,
+        core: &mut Instance,
     ) -> Self {
         assert_eq!(
             range.end() - range.start(),
@@ -128,7 +127,7 @@ impl JoinCycle for Cycle {
                                         .start_vertex()
                                         .clone()
                                 })
-                                .insert(services)
+                                .insert(&mut core.services)
                         },
                     )
                     .update_half_edge(
@@ -137,7 +136,7 @@ impl JoinCycle for Cycle {
                             edge.update_start_vertex(|_| {
                                 edge_other.start_vertex().clone()
                             })
-                            .insert(services)
+                            .insert(&mut core.services)
                         },
                     )
             },