From ff7406e6d8b70884faaff7707c7d917faabe1a53 Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Wed, 2 Apr 2025 13:30:01 +0200
Subject: refactor(ecs): remove unnecessary upgrading of lock lifetimes

---
 ecs/src/lock.rs         | 13 +------------
 ecs/src/relationship.rs | 12 ++++--------
 2 files changed, 5 insertions(+), 20 deletions(-)

(limited to 'ecs/src')

diff --git a/ecs/src/lock.rs b/ecs/src/lock.rs
index 1ce13fc..d6ed40e 100644
--- a/ecs/src/lock.rs
+++ b/ecs/src/lock.rs
@@ -1,4 +1,4 @@
-use std::mem::{forget, transmute};
+use std::mem::forget;
 use std::ops::{Deref, DerefMut};
 
 use parking_lot::{
@@ -101,17 +101,6 @@ where
             inner: RwLockReadGuard::map(inner, func),
         }
     }
-
-    /// Converts the `ReadGuard` to a `ReadGuard` with a possibly longer lifetime.
-    ///
-    /// # Safety
-    /// The returned `ReadGuard` must **NOT** be used for longer than the original
-    /// lifetime.
-    #[must_use]
-    pub unsafe fn upgrade_lifetime<'new>(self) -> ReadGuard<'new, Value>
-    {
-        unsafe { transmute(self) }
-    }
 }
 
 impl<Value> Deref for ReadGuard<'_, Value>
diff --git a/ecs/src/relationship.rs b/ecs/src/relationship.rs
index 89c64ed..235c21e 100644
--- a/ecs/src/relationship.rs
+++ b/ecs/src/relationship.rs
@@ -62,7 +62,7 @@ where
     Kind: 'static,
     ComponentT: Component,
 {
-    component_storage_lock: ReadGuard<'static, ComponentStorage>,
+    component_storage_lock: ReadGuard<'rel_comp, ComponentStorage>,
     relationship_comp: ComponentRefMut<'rel_comp, Relationship<Kind, ComponentT>>,
 }
 
@@ -91,9 +91,7 @@ where
 
         Ok(Self {
             relationship_comp,
-            // SAFETY: The component lock is not used for longer than the original
-            // lifetime
-            component_storage_lock: unsafe { component_storage_lock.upgrade_lifetime() },
+            component_storage_lock,
         })
     }
 }
@@ -286,7 +284,7 @@ where
     Kind: 'static,
     ComponentT: Component,
 {
-    component_storage_lock: ReadGuard<'static, ComponentStorage>,
+    component_storage_lock: ReadGuard<'rel_comp, ComponentStorage>,
     relationship_comp: ComponentRef<'rel_comp, Relationship<Kind, ComponentT>>,
 }
 
@@ -315,9 +313,7 @@ where
 
         Ok(Self {
             relationship_comp,
-            // SAFETY: The component lock is not used for longer than the original
-            // lifetime
-            component_storage_lock: unsafe { component_storage_lock.upgrade_lifetime() },
+            component_storage_lock,
         })
     }
 }
-- 
cgit v1.2.3-18-g5258