From e6c2bca05bd8ae4456a9376222d51ae5bea02b6a Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Tue, 6 Feb 2024 13:19:48 +0100
Subject: [PATCH] Expect `&mut Instance` in `JoinCycle::join_to`

---
 crates/fj-core/src/operations/build/shell.rs | 12 ++++++------
 crates/fj-core/src/operations/join/cycle.rs  |  9 ++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/crates/fj-core/src/operations/build/shell.rs b/crates/fj-core/src/operations/build/shell.rs
index e27ed9856..430d7b7aa 100644
--- 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
index 0817cd4a3..9aab3e8a3 100644
--- 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)
                         },
                     )
             },