streamline worker helpers

eigerco · Sep 30, 2024 · 989501e · 989501e
1 parent 2fd3aeb
commit 989501e
Showing 1 changed file with 6 additions and 25 deletions.
diff --git a/node-wasm/src/utils.rs b/node-wasm/src/utils.rs
@@ -82,46 +82,27 @@ pub(crate) fn js_value_from_display<D: fmt::Display>(value: D) -> JsValue {
 }
 
 trait WorkerSelf {
-    type GlobalScope;
-
-    fn worker_self() -> Self::GlobalScope;
-    fn is_worker_type() -> bool;
-}
-
-impl WorkerSelf for SharedWorker {
-    type GlobalScope = SharedWorkerGlobalScope;
+    type GlobalScope: JsCast;
 
     fn worker_self() -> Self::GlobalScope {
-        JsValue::from(js_sys::global()).into()
+        js_sys::global().unchecked_into()
     }
 
     fn is_worker_type() -> bool {
         js_sys::global().has_type::<Self::GlobalScope>()
     }
 }
 
+impl WorkerSelf for SharedWorker {
+    type GlobalScope = SharedWorkerGlobalScope;
+}
+
 impl WorkerSelf for Worker {
     type GlobalScope = DedicatedWorkerGlobalScope;
-
-    fn worker_self() -> Self::GlobalScope {
-        JsValue::from(js_sys::global()).into()
-    }
-
-    fn is_worker_type() -> bool {
-        js_sys::global().has_type::<Self::GlobalScope>()
-    }
 }
 
 impl WorkerSelf for ServiceWorker {
     type GlobalScope = ServiceWorkerGlobalScope;
-
-    fn worker_self() -> Self::GlobalScope {
-        JsValue::from(js_sys::global()).into()
-    }
-
-    fn is_worker_type() -> bool {
-        js_sys::global().has_type::<Self::GlobalScope>()
-    }
 }
 
 /// This type is useful in cases where we want to deal with de/serialising `Result<T, E>`, with