From da5bd11057ebe669202bfa4667ebfa1bc193aee7 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Thu, 4 May 2023 11:20:36 +0200
Subject: [PATCH] Make `Insert` more flexible

---
 crates/fj-kernel/src/algorithms/transform/mod.rs |  2 +-
 crates/fj-kernel/src/operations/insert.rs        | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/fj-kernel/src/algorithms/transform/mod.rs b/crates/fj-kernel/src/algorithms/transform/mod.rs
index c61c5234e..2157917f4 100644
--- a/crates/fj-kernel/src/algorithms/transform/mod.rs
+++ b/crates/fj-kernel/src/algorithms/transform/mod.rs
@@ -69,7 +69,7 @@ pub trait TransformObject: Sized {
 
 impl<T> TransformObject for Handle<T>
 where
-    T: Clone + Insert + TransformObject + 'static,
+    T: Clone + Insert<Inserted = Handle<T>> + TransformObject + 'static,
 {
     fn transform_with_cache(
         self,
diff --git a/crates/fj-kernel/src/operations/insert.rs b/crates/fj-kernel/src/operations/insert.rs
index fc98e5273..9fe879f46 100644
--- a/crates/fj-kernel/src/operations/insert.rs
+++ b/crates/fj-kernel/src/operations/insert.rs
@@ -12,15 +12,23 @@ use crate::{
 /// This is the only primitive operation that is directly understood by
 /// `Service<Objects>`. All other operations are built on top of it.
 pub trait Insert: Sized {
+    /// The type of `Self`, once it has been inserted
+    ///
+    /// Usually this is just `Handle<Self>`, but there are some more complex
+    /// cases where this type needs to be customized.
+    type Inserted;
+
     /// Insert the object into its respective store
-    fn insert(self, services: &mut Services) -> Handle<Self>;
+    fn insert(self, services: &mut Services) -> Self::Inserted;
 }
 
 macro_rules! impl_insert {
     ($($ty:ty, $store:ident;)*) => {
         $(
             impl Insert for $ty {
-                fn insert(self, services: &mut Services) -> Handle<Self> {
+                type Inserted = Handle<Self>;
+
+                fn insert(self, services: &mut Services) -> Self::Inserted {
                     let handle = services.objects.$store.reserve();
                     let object = (handle.clone(), self).into();
                     services.insert_object(object);