Simplify ServiceObjectsExt::insert

hannobraun · Mar 22, 2023 · 310a48e · 310a48e
1 parent cb578fc
commit 310a48e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/crates/fj-kernel/src/insert.rs b/crates/fj-kernel/src/insert.rs
@@ -25,7 +25,7 @@ macro_rules! impl_insert {
                 fn insert(self, objects: &mut Service<Objects>) -> Handle<Self>
                 {
                     let handle = objects.$store.reserve();
-                    objects.insert(handle.clone(), self);
+                    objects.insert((handle.clone(), self).into());
                     handle
                 }
             }

diff --git a/crates/fj-kernel/src/services/objects.rs b/crates/fj-kernel/src/services/objects.rs
@@ -1,7 +1,4 @@
-use crate::{
-    objects::{Object, Objects, WithHandle},
-    storage::Handle,
-};
+use crate::objects::{Object, Objects, WithHandle};
 
 use super::{Service, State};
 
@@ -45,18 +42,11 @@ pub struct InsertObject {
 /// Convenient API for `Service<Objects>`
 pub trait ServiceObjectsExt {
     /// Insert an object
-    fn insert<T>(&mut self, handle: Handle<T>, object: T)
-    where
-        (Handle<T>, T): Into<Object<WithHandle>>;
+    fn insert(&mut self, object: Object<WithHandle>);
 }
 
 impl ServiceObjectsExt for Service<Objects> {
-    fn insert<T>(&mut self, handle: Handle<T>, object: T)
-    where
-        (Handle<T>, T): Into<Object<WithHandle>>,
-    {
-        self.execute(Operation::InsertObject {
-            object: (handle, object).into(),
-        });
+    fn insert(&mut self, object: Object<WithHandle>) {
+        self.execute(Operation::InsertObject { object });
     }
 }