yolo mutex unwrap?

unavi-xyz · Jun 27, 2024 · c05bf78 · c05bf78
1 parent d8d5f34
commit c05bf78
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/crates/unavi-scripting/src/execution.rs b/crates/unavi-scripting/src/execution.rs
@@ -25,21 +25,21 @@ pub fn init_scripts(
 ) {
     for (entity, name) in to_init.iter() {
         let res = block_on(async {
-            let mut scripts = scripts.lock().await;
-            let (script, store) = scripts.get_mut(&entity).unwrap();
-
             let span = info_span!("ScriptInit", name = name.to_string());
             let span = span.enter();
 
-            info!("begin");
+            info!("Initializing script");
+
+            let mut scripts = scripts.lock().unwrap();
+            let (script, store) = scripts.get_mut(&entity).unwrap();
 
             let res = script
                 .wired_script_types()
                 .script()
                 .call_constructor(store)
                 .await;
 
-            info!("end");
+            info!("Done");
             drop(span);
 
             res
@@ -64,21 +64,21 @@ pub fn update_scripts(
 
     for (entity, name, res) in to_update.iter_mut() {
         let res: anyhow::Result<_> = block_on(async {
-            let mut scripts = scripts.lock().await;
-            let (script, store) = scripts.get_mut(&entity).unwrap();
-
             let span = trace_span!("ScriptUpdate", name = name.to_string(), delta);
             let span = span.enter();
 
-            trace!("begin");
+            trace!("Updating script");
+
+            let mut scripts = scripts.lock().unwrap();
+            let (script, store) = scripts.get_mut(&entity).unwrap();
 
             let res = script
                 .wired_script_types()
                 .script()
                 .call_update(store.as_context_mut(), res.0, delta)
                 .await;
 
-            trace!("end");
+            trace!("Done");
             drop(span);
 
             res

diff --git a/crates/unavi-scripting/src/load.rs b/crates/unavi-scripting/src/load.rs
@@ -1,8 +1,7 @@
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};
 
 use bevy::{prelude::*, utils::HashMap};
 use bevy_async_task::{AsyncTaskPool, AsyncTaskStatus};
-use tokio::sync::Mutex;
 use wasm_bridge::{component::Linker, Config, Engine, Store};
 
 use crate::{
@@ -68,7 +67,7 @@ pub fn load_scripts(
             let (script, _) =
                 Script::instantiate_async(&mut store, &component, &mut linker).await?;
 
-            let mut scripts = scripts.lock().await;
+            let mut scripts = scripts.lock().unwrap();
             scripts.insert(entity, (script, store));
 
             Ok(entity)