Remove cell

DelSkayn · Oct 10, 2024 · 8705649 · 8705649
1 parent 909d347
commit 8705649
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/core/src/class/id.rs b/core/src/class/id.rs
@@ -30,7 +30,7 @@ impl ClassId {
         let type_id = self.init_type_id();
         let key = ClassIdKey(rt, type_id);
 
-        let opaque = unsafe { &(*qjs::JS_GetRuntimeOpaque(rt).cast::<Opaque>()) };
+        let opaque = unsafe { &mut (*qjs::JS_GetRuntimeOpaque(rt).cast::<Opaque>()) };
 
         let id = opaque.get_class_id_map().entry(key).or_insert_with(|| {
             let mut id = 0;

diff --git a/core/src/runtime/opaque.rs b/core/src/runtime/opaque.rs
@@ -33,7 +33,7 @@ pub(crate) struct Opaque<'js> {
     /// The user provided interrupt handler, if any.
     interrupt_handler: UnsafeCell<Option<InterruptHandler>>,
 
-    class_id_map: UnsafeCell<HashMap<ClassIdKey, qjs::JSClassID>>,
+    class_id_map: HashMap<ClassIdKey, qjs::JSClassID>,
 
     userdata: UserDataMap,
 
@@ -48,7 +48,7 @@ impl<'js> Opaque<'js> {
         Opaque {
             panic: Cell::new(None),
             interrupt_handler: UnsafeCell::new(None),
-            class_id_map: UnsafeCell::new(HashMap::new()),
+            class_id_map: HashMap::new(),
             userdata: UserDataMap::default(),
             #[cfg(feature = "futures")]
             spawner: None,
@@ -61,7 +61,7 @@ impl<'js> Opaque<'js> {
         Opaque {
             panic: Cell::new(None),
             interrupt_handler: UnsafeCell::new(None),
-            class_id_map: UnsafeCell::new(HashMap::new()),
+            class_id_map: HashMap::new(),
             userdata: UserDataMap::default(),
             #[cfg(feature = "futures")]
             spawner: Some(UnsafeCell::new(Spawner::new())),
@@ -133,7 +133,7 @@ impl<'js> Opaque<'js> {
         self.panic.take()
     }
 
-    pub(crate) fn get_class_id_map(&self) -> &mut HashMap<ClassIdKey, u32> {
-        unsafe { &mut *self.class_id_map.get() }
+    pub(crate) fn get_class_id_map(&mut self) -> &mut HashMap<ClassIdKey, u32> {
+        &mut self.class_id_map
     }
 }