Merge branch 'main' into bot-rust-update

Author: peterpeterparker

Cargo.lock

@@ -37,10 +37,7 @@ junobuild-macros = { path = "../libs/macros" }
 junobuild-storage = { path = "../libs/storage" }
 junobuild-utils = { path = "../libs/utils" }
 ic-wasi-polyfill = "0.12.0"
-rquickjs = { version = "0.11.0", git = "https://github.com/DelSkayn/rquickjs", rev = "5dcebf0e1e4f242de4b98208c328bf69eb4ac1e6", features = [
-	"macro",
-	"futures"
-] }
+rquickjs = { version = "0.12.0", features = ["macro", "futures"] }
 anyhow = "1.0.79"
 itoa = { version = "1", default-features = false }
 ryu = { version = "1", default-features = false }

src/sputnik/Cargo.toml

@@ -7,7 +7,7 @@ use crate::js::apis::init_apis;
 use crate::js::dev::script::declare_dev_script;
 use crate::js::inner_utils::format_js_error;
 use rquickjs::{
-    async_with, AsyncContext, AsyncRuntime, CatchResultExt, Context, Ctx, Error as JsError, Runtime,
+    AsyncContext, AsyncRuntime, CatchResultExt, Context, Ctx, Error as JsError, Runtime,
 };
 
 pub trait RunAsyncJsFn<T = ()> {
@@ -24,16 +24,17 @@ where
         .await
         .map_err(|e| format_js_error(JUNO_SPUTNIK_ERROR_RUNTIME_ASYNC_CONTEXT, e))?;
 
-    let result = async_with!(ctx => |ctx|{
-        init_apis(&ctx).map_err(|e| format_js_error(JUNO_SPUTNIK_ERROR_RUNTIME_API_INIT, e))?;
+    let result = ctx
+        .async_with(async |ctx| {
+            init_apis(&ctx).map_err(|e| format_js_error(JUNO_SPUTNIK_ERROR_RUNTIME_API_INIT, e))?;
 
-        declare_dev_script(&ctx).map_err(|e| e.to_string())?;
+            declare_dev_script(&ctx).map_err(|e| e.to_string())?;
 
-        let result = f.run(&ctx).await.catch(&ctx).map_err(|e| e.to_string())?;
+            let result = f.run(&ctx).await.catch(&ctx).map_err(|e| e.to_string())?;
 
-        Ok::<T, String>(result)
-    })
-    .await?;
+            Ok::<T, String>(result)
+        })
+        .await?;
 
     rt.idle().await;