Skip to content

chore(sputnik): replace deprecated async_with! macro #2803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peterpeterparker wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(sputnik): replace deprecated async_with! macro #2803

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/sputnik/src/js/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ()> {
Expand All @@ -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;

Expand Down
Loading