summaryrefslogtreecommitdiff
path: root/core/bindings.rs
diff options
context:
space:
mode:
Diffstat (limited to 'core/bindings.rs')
-rw-r--r--core/bindings.rs470
1 files changed, 191 insertions, 279 deletions
diff --git a/core/bindings.rs b/core/bindings.rs
index 9b66bfc48..6407cb555 100644
--- a/core/bindings.rs
+++ b/core/bindings.rs
@@ -53,7 +53,7 @@ lazy_static! {
}
pub fn script_origin<'a>(
- s: &mut impl v8::ToLocal<'a>,
+ s: &mut v8::HandleScope<'a>,
resource_name: v8::Local<'a, v8::String>,
) -> v8::ScriptOrigin<'a> {
let resource_line_offset = v8::Integer::new(s, 0);
@@ -78,7 +78,7 @@ pub fn script_origin<'a>(
}
pub fn module_origin<'a>(
- s: &mut impl v8::ToLocal<'a>,
+ s: &mut v8::HandleScope<'a>,
resource_name: v8::Local<'a, v8::String>,
) -> v8::ScriptOrigin<'a> {
let resource_line_offset = v8::Integer::new(s, 0);
@@ -103,127 +103,92 @@ pub fn module_origin<'a>(
}
pub fn initialize_context<'s>(
- scope: &mut impl v8::ToLocal<'s>,
+ scope: &mut v8::HandleScope<'s, ()>,
) -> v8::Local<'s, v8::Context> {
- let mut hs = v8::EscapableHandleScope::new(scope);
- let scope = hs.enter();
+ let scope = &mut v8::EscapableHandleScope::new(scope);
let context = v8::Context::new(scope);
let global = context.global(scope);
- let mut cs = v8::ContextScope::new(scope, context);
- let scope = cs.enter();
+ let scope = &mut v8::ContextScope::new(scope, context);
+ let deno_key = v8::String::new(scope, "Deno").unwrap();
let deno_val = v8::Object::new(scope);
- global.set(
- context,
- v8::String::new(scope, "Deno").unwrap().into(),
- deno_val.into(),
- );
-
- let mut core_val = v8::Object::new(scope);
- deno_val.set(
- context,
- v8::String::new(scope, "core").unwrap().into(),
- core_val.into(),
- );
-
- let mut print_tmpl = v8::FunctionTemplate::new(scope, print);
- let print_val = print_tmpl.get_function(scope, context).unwrap();
- core_val.set(
- context,
- v8::String::new(scope, "print").unwrap().into(),
- print_val.into(),
- );
-
- let mut recv_tmpl = v8::FunctionTemplate::new(scope, recv);
- let recv_val = recv_tmpl.get_function(scope, context).unwrap();
- core_val.set(
- context,
- v8::String::new(scope, "recv").unwrap().into(),
- recv_val.into(),
- );
-
- let mut send_tmpl = v8::FunctionTemplate::new(scope, send);
- let send_val = send_tmpl.get_function(scope, context).unwrap();
- core_val.set(
- context,
- v8::String::new(scope, "send").unwrap().into(),
- send_val.into(),
- );
-
- let mut set_macrotask_callback_tmpl =
+ global.set(scope, deno_key.into(), deno_val.into());
+
+ let core_key = v8::String::new(scope, "core").unwrap();
+ let core_val = v8::Object::new(scope);
+ deno_val.set(scope, core_key.into(), core_val.into());
+
+ let print_key = v8::String::new(scope, "print").unwrap();
+ let print_tmpl = v8::FunctionTemplate::new(scope, print);
+ let print_val = print_tmpl.get_function(scope).unwrap();
+ core_val.set(scope, print_key.into(), print_val.into());
+
+ let recv_key = v8::String::new(scope, "recv").unwrap();
+ let recv_tmpl = v8::FunctionTemplate::new(scope, recv);
+ let recv_val = recv_tmpl.get_function(scope).unwrap();
+ core_val.set(scope, recv_key.into(), recv_val.into());
+
+ let send_key = v8::String::new(scope, "send").unwrap();
+ let send_tmpl = v8::FunctionTemplate::new(scope, send);
+ let send_val = send_tmpl.get_function(scope).unwrap();
+ core_val.set(scope, send_key.into(), send_val.into());
+
+ let set_macrotask_callback_key =
+ v8::String::new(scope, "setMacrotaskCallback").unwrap();
+ let set_macrotask_callback_tmpl =
v8::FunctionTemplate::new(scope, set_macrotask_callback);
- let set_macrotask_callback_val = set_macrotask_callback_tmpl
- .get_function(scope, context)
- .unwrap();
+ let set_macrotask_callback_val =
+ set_macrotask_callback_tmpl.get_function(scope).unwrap();
core_val.set(
- context,
- v8::String::new(scope, "setMacrotaskCallback")
- .unwrap()
- .into(),
+ scope,
+ set_macrotask_callback_key.into(),
set_macrotask_callback_val.into(),
);
- let mut eval_context_tmpl = v8::FunctionTemplate::new(scope, eval_context);
- let eval_context_val =
- eval_context_tmpl.get_function(scope, context).unwrap();
- core_val.set(
- context,
- v8::String::new(scope, "evalContext").unwrap().into(),
- eval_context_val.into(),
- );
-
- let mut format_error_tmpl = v8::FunctionTemplate::new(scope, format_error);
- let format_error_val =
- format_error_tmpl.get_function(scope, context).unwrap();
- core_val.set(
- context,
- v8::String::new(scope, "formatError").unwrap().into(),
- format_error_val.into(),
- );
-
- let mut encode_tmpl = v8::FunctionTemplate::new(scope, encode);
- let encode_val = encode_tmpl.get_function(scope, context).unwrap();
- core_val.set(
- context,
- v8::String::new(scope, "encode").unwrap().into(),
- encode_val.into(),
- );
-
- let mut decode_tmpl = v8::FunctionTemplate::new(scope, decode);
- let decode_val = decode_tmpl.get_function(scope, context).unwrap();
- core_val.set(
- context,
- v8::String::new(scope, "decode").unwrap().into(),
- decode_val.into(),
- );
-
- let mut get_promise_details_tmpl =
+ let eval_context_key = v8::String::new(scope, "evalContext").unwrap();
+ let eval_context_tmpl = v8::FunctionTemplate::new(scope, eval_context);
+ let eval_context_val = eval_context_tmpl.get_function(scope).unwrap();
+ core_val.set(scope, eval_context_key.into(), eval_context_val.into());
+
+ let format_error_key = v8::String::new(scope, "formatError").unwrap();
+ let format_error_tmpl = v8::FunctionTemplate::new(scope, format_error);
+ let format_error_val = format_error_tmpl.get_function(scope).unwrap();
+ core_val.set(scope, format_error_key.into(), format_error_val.into());
+
+ let encode_key = v8::String::new(scope, "encode").unwrap();
+ let encode_tmpl = v8::FunctionTemplate::new(scope, encode);
+ let encode_val = encode_tmpl.get_function(scope).unwrap();
+ core_val.set(scope, encode_key.into(), encode_val.into());
+
+ let decode_key = v8::String::new(scope, "decode").unwrap();
+ let decode_tmpl = v8::FunctionTemplate::new(scope, decode);
+ let decode_val = decode_tmpl.get_function(scope).unwrap();
+ core_val.set(scope, decode_key.into(), decode_val.into());
+
+ let get_promise_details_key =
+ v8::String::new(scope, "getPromiseDetails").unwrap();
+ let get_promise_details_tmpl =
v8::FunctionTemplate::new(scope, get_promise_details);
- let get_promise_details_val = get_promise_details_tmpl
- .get_function(scope, context)
- .unwrap();
+ let get_promise_details_val =
+ get_promise_details_tmpl.get_function(scope).unwrap();
core_val.set(
- context,
- v8::String::new(scope, "getPromiseDetails").unwrap().into(),
+ scope,
+ get_promise_details_key.into(),
get_promise_details_val.into(),
);
- core_val.set_accessor(
- context,
- v8::String::new(scope, "shared").unwrap().into(),
- shared_getter,
- );
+ let shared_key = v8::String::new(scope, "shared").unwrap();
+ core_val.set_accessor(scope, shared_key.into(), shared_getter);
// Direct bindings on `window`.
- let mut queue_microtask_tmpl =
- v8::FunctionTemplate::new(scope, queue_microtask);
- let queue_microtask_val =
- queue_microtask_tmpl.get_function(scope, context).unwrap();
+ let queue_microtask_key = v8::String::new(scope, "queueMicrotask").unwrap();
+ let queue_microtask_tmpl = v8::FunctionTemplate::new(scope, queue_microtask);
+ let queue_microtask_val = queue_microtask_tmpl.get_function(scope).unwrap();
global.set(
- context,
- v8::String::new(scope, "queueMicrotask").unwrap().into(),
+ scope,
+ queue_microtask_key.into(),
queue_microtask_val.into(),
);
@@ -231,7 +196,7 @@ pub fn initialize_context<'s>(
}
pub fn boxed_slice_to_uint8array<'sc>(
- scope: &mut impl v8::ToLocal<'sc>,
+ scope: &mut v8::HandleScope<'sc>,
buf: Box<[u8]>,
) -> v8::Local<'sc, v8::Uint8Array> {
assert!(!buf.is_empty());
@@ -248,9 +213,7 @@ pub extern "C" fn host_import_module_dynamically_callback(
referrer: v8::Local<v8::ScriptOrModule>,
specifier: v8::Local<v8::String>,
) -> *mut v8::Promise {
- let mut cbs = v8::CallbackScope::new_escapable(context);
- let mut hs = v8::EscapableHandleScope::new(cbs.enter());
- let scope = hs.enter();
+ let scope = &mut unsafe { v8::CallbackScope::new(context) };
// NOTE(bartlomieju): will crash for non-UTF-8 specifier
let specifier_str = specifier
@@ -269,19 +232,19 @@ pub extern "C" fn host_import_module_dynamically_callback(
let host_defined_options = referrer.get_host_defined_options();
assert_eq!(host_defined_options.length(), 0);
- let resolver = v8::PromiseResolver::new(scope, context).unwrap();
+ let resolver = v8::PromiseResolver::new(scope).unwrap();
let promise = resolver.get_promise(scope);
let mut resolver_handle = v8::Global::new();
resolver_handle.set(scope, resolver);
{
- let state_rc = EsIsolate::state(scope.isolate());
+ let state_rc = EsIsolate::state(scope);
let mut state = state_rc.borrow_mut();
state.dyn_import_cb(resolver_handle, &specifier_str, &referrer_name_str);
}
- &mut *scope.escape(promise)
+ &*promise as *const _ as *mut _
}
pub extern "C" fn host_initialize_import_meta_object_callback(
@@ -289,10 +252,8 @@ pub extern "C" fn host_initialize_import_meta_object_callback(
module: v8::Local<v8::Module>,
meta: v8::Local<v8::Object>,
) {
- let mut cbs = v8::CallbackScope::new(context);
- let mut hs = v8::HandleScope::new(cbs.enter());
- let scope = hs.enter();
- let state_rc = EsIsolate::state(scope.isolate());
+ let scope = &mut unsafe { v8::CallbackScope::new(context) };
+ let state_rc = EsIsolate::state(scope);
let state = state_rc.borrow();
let id = module.get_identity_hash();
@@ -300,30 +261,21 @@ pub extern "C" fn host_initialize_import_meta_object_callback(
let info = state.modules.get_info(id).expect("Module not found");
- meta.create_data_property(
- context,
- v8::String::new(scope, "url").unwrap().into(),
- v8::String::new(scope, &info.name).unwrap().into(),
- );
- meta.create_data_property(
- context,
- v8::String::new(scope, "main").unwrap().into(),
- v8::Boolean::new(scope, info.main).into(),
- );
+ let url_key = v8::String::new(scope, "url").unwrap();
+ let url_val = v8::String::new(scope, &info.name).unwrap();
+ meta.create_data_property(scope, url_key.into(), url_val.into());
+
+ let main_key = v8::String::new(scope, "main").unwrap();
+ let main_val = v8::Boolean::new(scope, info.main);
+ meta.create_data_property(scope, main_key.into(), main_val.into());
}
pub extern "C" fn promise_reject_callback(message: v8::PromiseRejectMessage) {
- let mut cbs = v8::CallbackScope::new(&message);
- let mut hs = v8::HandleScope::new(cbs.enter());
- let scope = hs.enter();
+ let scope = &mut unsafe { v8::CallbackScope::new(&message) };
- let state_rc = CoreIsolate::state(scope.isolate());
+ let state_rc = CoreIsolate::state(scope);
let mut state = state_rc.borrow_mut();
- let context = state.global_context.get(scope).unwrap();
- let mut cs = v8::ContextScope::new(scope, context);
- let scope = cs.enter();
-
let promise = message.get_promise();
let promise_id = promise.get_identity_hash();
@@ -374,7 +326,7 @@ pub(crate) unsafe fn get_backing_store_slice_mut(
}
fn print(
- scope: v8::FunctionCallbackScope,
+ scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
_rv: v8::ReturnValue,
) {
@@ -384,9 +336,6 @@ fn print(
let obj = args.get(0);
let is_err_arg = args.get(1);
- let mut hs = v8::HandleScope::new(scope);
- let scope = hs.enter();
-
let mut is_err = false;
if arg_len == 2 {
let int_val = is_err_arg
@@ -394,30 +343,29 @@ fn print(
.expect("Unable to convert to integer");
is_err = int_val != 0;
};
- let mut try_catch = v8::TryCatch::new(scope);
- let _tc = try_catch.enter();
- let str_ = match obj.to_string(scope) {
+ let tc_scope = &mut v8::TryCatch::new(scope);
+ let str_ = match obj.to_string(tc_scope) {
Some(s) => s,
- None => v8::String::new(scope, "").unwrap(),
+ None => v8::String::new(tc_scope, "").unwrap(),
};
if is_err {
- eprint!("{}", str_.to_rust_string_lossy(scope));
+ eprint!("{}", str_.to_rust_string_lossy(tc_scope));
} else {
- print!("{}", str_.to_rust_string_lossy(scope));
+ print!("{}", str_.to_rust_string_lossy(tc_scope));
}
}
fn recv(
- scope: v8::FunctionCallbackScope,
+ scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
_rv: v8::ReturnValue,
) {
- let state_rc = CoreIsolate::state(scope.isolate());
+ let state_rc = CoreIsolate::state(scope);
let mut state = state_rc.borrow_mut();
if !state.js_recv_cb.is_empty() {
let msg = v8::String::new(scope, "Deno.core.recv already called.").unwrap();
- scope.isolate().throw_exception(msg.into());
+ scope.throw_exception(msg.into());
return;
}
@@ -426,7 +374,7 @@ fn recv(
}
fn send(
- scope: v8::FunctionCallbackScope,
+ scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue,
) {
@@ -435,7 +383,7 @@ fn send(
Err(err) => {
let msg = format!("invalid op id: {}", err);
let msg = v8::String::new(scope, &msg).unwrap();
- scope.isolate().throw_exception(msg.into());
+ scope.throw_exception(msg.into());
return;
}
};
@@ -453,7 +401,7 @@ fn send(
Err(_) => &[],
};
- let state_rc = CoreIsolate::state(scope.isolate());
+ let state_rc = CoreIsolate::state(scope);
let mut state = state_rc.borrow_mut();
assert!(!state.global_context.is_empty());
@@ -493,7 +441,7 @@ fn send(
let maybe_response = match buf_iter_result {
Ok(bufs) => state.dispatch_op(scope, op_id, control, bufs),
Err(exc) => {
- scope.isolate().throw_exception(exc);
+ scope.throw_exception(exc);
return;
}
};
@@ -511,18 +459,18 @@ fn send(
}
fn set_macrotask_callback(
- scope: v8::FunctionCallbackScope,
+ scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
_rv: v8::ReturnValue,
) {
- let state_rc = CoreIsolate::state(scope.isolate());
+ let state_rc = CoreIsolate::state(scope);
let mut state = state_rc.borrow_mut();
if !state.js_macrotask_cb.is_empty() {
let msg =
v8::String::new(scope, "Deno.core.setMacrotaskCallback already called.")
.unwrap();
- scope.isolate().throw_exception(msg.into());
+ scope.throw_exception(msg.into());
return;
}
@@ -532,23 +480,16 @@ fn set_macrotask_callback(
}
fn eval_context(
- scope: v8::FunctionCallbackScope,
+ scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue,
) {
- let state_rc = CoreIsolate::state(scope.isolate());
- let context = {
- let state = state_rc.borrow();
- assert!(!state.global_context.is_empty());
- state.global_context.get(scope).unwrap()
- };
-
let source = match v8::Local::<v8::String>::try_from(args.get(0)) {
Ok(s) => s,
Err(_) => {
let msg = v8::String::new(scope, "Invalid argument").unwrap();
let exception = v8::Exception::type_error(scope, msg);
- scope.isolate().throw_exception(exception);
+ scope.throw_exception(exception);
return;
}
};
@@ -566,116 +507,108 @@ fn eval_context(
isCompileError: boolean,
}
*/
- let mut try_catch = v8::TryCatch::new(scope);
- let tc = try_catch.enter();
+ let tc_scope = &mut v8::TryCatch::new(scope);
let name =
- v8::String::new(scope, url.as_ref().map_or("<unknown>", Url::as_str))
+ v8::String::new(tc_scope, url.as_ref().map_or("<unknown>", Url::as_str))
.unwrap();
- let origin = script_origin(scope, name);
- let maybe_script = v8::Script::compile(scope, context, source, Some(&origin));
+ let origin = script_origin(tc_scope, name);
+ let maybe_script = v8::Script::compile(tc_scope, source, Some(&origin));
if maybe_script.is_none() {
- assert!(tc.has_caught());
- let exception = tc.exception(scope).unwrap();
+ assert!(tc_scope.has_caught());
+ let exception = tc_scope.exception().unwrap();
- output.set(
- context,
- v8::Integer::new(scope, 0).into(),
- v8::null(scope).into(),
- );
+ let js_zero = v8::Integer::new(tc_scope, 0);
+ let js_null = v8::null(tc_scope);
+ output.set(tc_scope, js_zero.into(), js_null.into());
- let errinfo_obj = v8::Object::new(scope);
- errinfo_obj.set(
- context,
- v8::String::new(scope, "isCompileError").unwrap().into(),
- v8::Boolean::new(scope, true).into(),
- );
+ let errinfo_obj = v8::Object::new(tc_scope);
+ let is_compile_error_key =
+ v8::String::new(tc_scope, "isCompileError").unwrap();
+ let is_compile_error_val = v8::Boolean::new(tc_scope, true);
errinfo_obj.set(
- context,
- v8::String::new(scope, "isNativeError").unwrap().into(),
- v8::Boolean::new(scope, exception.is_native_error()).into(),
+ tc_scope,
+ is_compile_error_key.into(),
+ is_compile_error_val.into(),
);
+ let is_native_error_key =
+ v8::String::new(tc_scope, "isNativeError").unwrap();
+ let is_native_error_val =
+ v8::Boolean::new(tc_scope, exception.is_native_error());
errinfo_obj.set(
- context,
- v8::String::new(scope, "thrown").unwrap().into(),
- exception,
+ tc_scope,
+ is_native_error_key.into(),
+ is_native_error_val.into(),
);
- output.set(
- context,
- v8::Integer::new(scope, 1).into(),
- errinfo_obj.into(),
- );
+ let thrown_key = v8::String::new(tc_scope, "thrown").unwrap();
+ errinfo_obj.set(tc_scope, thrown_key.into(), exception);
+
+ let js_one = v8::Integer::new(tc_scope, 1);
+ output.set(tc_scope, js_one.into(), errinfo_obj.into());
rv.set(output.into());
return;
}
- let result = maybe_script.unwrap().run(scope, context);
+ let result = maybe_script.unwrap().run(tc_scope);
if result.is_none() {
- assert!(tc.has_caught());
- let exception = tc.exception(scope).unwrap();
-
- output.set(
- context,
- v8::Integer::new(scope, 0).into(),
- v8::null(scope).into(),
- );
+ assert!(tc_scope.has_caught());
+ let exception = tc_scope.exception().unwrap();
- let errinfo_obj = v8::Object::new(scope);
- errinfo_obj.set(
- context,
- v8::String::new(scope, "isCompileError").unwrap().into(),
- v8::Boolean::new(scope, false).into(),
- );
+ let js_zero = v8::Integer::new(tc_scope, 0);
+ let js_null = v8::null(tc_scope);
+ output.set(tc_scope, js_zero.into(), js_null.into());
- let is_native_error = if exception.is_native_error() {
- v8::Boolean::new(scope, true)
- } else {
- v8::Boolean::new(scope, false)
- };
+ let errinfo_obj = v8::Object::new(tc_scope);
+ let is_compile_error_key =
+ v8::String::new(tc_scope, "isCompileError").unwrap();
+ let is_compile_error_val = v8::Boolean::new(tc_scope, false);
errinfo_obj.set(
- context,
- v8::String::new(scope, "isNativeError").unwrap().into(),
- is_native_error.into(),
+ tc_scope,
+ is_compile_error_key.into(),
+ is_compile_error_val.into(),
);
+ let is_native_error_key =
+ v8::String::new(tc_scope, "isNativeError").unwrap();
+ let is_native_error_val =
+ v8::Boolean::new(tc_scope, exception.is_native_error());
errinfo_obj.set(
- context,
- v8::String::new(scope, "thrown").unwrap().into(),
- exception,
+ tc_scope,
+ is_native_error_key.into(),
+ is_native_error_val.into(),
);
- output.set(
- context,
- v8::Integer::new(scope, 1).into(),
- errinfo_obj.into(),
- );
+ let thrown_key = v8::String::new(tc_scope, "thrown").unwrap();
+ errinfo_obj.set(tc_scope, thrown_key.into(), exception);
+
+ let js_one = v8::Integer::new(tc_scope, 1);
+ output.set(tc_scope, js_one.into(), errinfo_obj.into());
rv.set(output.into());
return;
}
- output.set(context, v8::Integer::new(scope, 0).into(), result.unwrap());
- output.set(
- context,
- v8::Integer::new(scope, 1).into(),
- v8::null(scope).into(),
- );
+ let js_zero = v8::Integer::new(tc_scope, 0);
+ let js_one = v8::Integer::new(tc_scope, 1);
+ let js_null = v8::null(tc_scope);
+ output.set(tc_scope, js_zero.into(), result.unwrap());
+ output.set(tc_scope, js_one.into(), js_null.into());
rv.set(output.into());
}
fn format_error(
- scope: v8::FunctionCallbackScope,
+ scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue,
) {
let e = JSError::from_v8_exception(scope, args.get(0));
- let state_rc = CoreIsolate::state(scope.isolate());
+ let state_rc = CoreIsolate::state(scope);
let state = state_rc.borrow();
let e = (state.js_error_create_fn)(e);
let e = e.to_string();
@@ -684,7 +617,7 @@ fn format_error(
}
fn encode(
- scope: v8::FunctionCallbackScope,
+ scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue,
) {
@@ -693,7 +626,7 @@ fn encode(
Err(_) => {
let msg = v8::String::new(scope, "Invalid argument").unwrap();
let exception = v8::Exception::type_error(scope, msg);
- scope.isolate().throw_exception(exception);
+ scope.throw_exception(exception);
return;
}
};
@@ -717,7 +650,7 @@ fn encode(
}
fn decode(
- scope: v8::FunctionCallbackScope,
+ scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue,
) {
@@ -726,7 +659,7 @@ fn decode(
Err(_) => {
let msg = v8::String::new(scope, "Invalid argument").unwrap();
let exception = v8::Exception::type_error(scope, msg);
- scope.isolate().throw_exception(exception);
+ scope.throw_exception(exception);
return;
}
};
@@ -746,27 +679,27 @@ fn decode(
}
fn queue_microtask(
- scope: v8::FunctionCallbackScope,
+ scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
_rv: v8::ReturnValue,
) {
match v8::Local::<v8::Function>::try_from(args.get(0)) {
- Ok(f) => scope.isolate().enqueue_microtask(f),
+ Ok(f) => scope.enqueue_microtask(f),
Err(_) => {
let msg = v8::String::new(scope, "Invalid argument").unwrap();
let exception = v8::Exception::type_error(scope, msg);
- scope.isolate().throw_exception(exception);
+ scope.throw_exception(exception);
}
};
}
fn shared_getter(
- scope: v8::PropertyCallbackScope,
+ scope: &mut v8::HandleScope,
_name: v8::Local<v8::Name>,
_args: v8::PropertyCallbackArguments,
mut rv: v8::ReturnValue,
) {
- let state_rc = CoreIsolate::state(scope.isolate());
+ let state_rc = CoreIsolate::state(scope);
let mut state = state_rc.borrow_mut();
// Lazily initialize the persistent external ArrayBuffer.
@@ -787,11 +720,9 @@ pub fn module_resolve_callback<'s>(
specifier: v8::Local<'s, v8::String>,
referrer: v8::Local<'s, v8::Module>,
) -> Option<v8::Local<'s, v8::Module>> {
- let mut scope = v8::CallbackScope::new_escapable(context);
- let mut scope = v8::EscapableHandleScope::new(scope.enter());
- let scope = scope.enter();
+ let scope = &mut unsafe { v8::CallbackScope::new(context) };
- let state_rc = EsIsolate::state(scope.isolate());
+ let state_rc = EsIsolate::state(scope);
let mut state = state_rc.borrow_mut();
let referrer_id = referrer.get_identity_hash();
@@ -819,13 +750,11 @@ pub fn module_resolve_callback<'s>(
req_str, referrer_name
);
let msg = v8::String::new(scope, &msg).unwrap();
- scope.isolate().throw_exception(msg.into());
+ scope.throw_exception(msg.into());
break;
}
- return maybe_info
- .and_then(|i| i.handle.get(scope))
- .map(|m| scope.escape(m));
+ return maybe_info.and_then(|i| i.handle.get(scope));
}
}
@@ -833,26 +762,21 @@ pub fn module_resolve_callback<'s>(
}
// Returns promise details or throw TypeError, if argument passed isn't a Promise.
-// Promise details is a two elements array.
+// Promise details is a js_two elements array.
// promise_details = [State, Result]
// State = enum { Pending = 0, Fulfilled = 1, Rejected = 2}
// Result = PromiseResult<T> | PromiseError
fn get_promise_details(
- scope: v8::FunctionCallbackScope,
+ scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue,
) {
- let state_rc = CoreIsolate::state(scope.isolate());
- let state = state_rc.borrow();
- assert!(!state.global_context.is_empty());
- let context = state.global_context.get(scope).unwrap();
-
let promise = match v8::Local::<v8::Promise>::try_from(args.get(0)) {
Ok(val) => val,
Err(_) => {
let msg = v8::String::new(scope, "Invalid argument").unwrap();
let exception = v8::Exception::type_error(scope, msg);
- scope.isolate().throw_exception(exception);
+ scope.throw_exception(exception);
return;
}
};
@@ -861,37 +785,25 @@ fn get_promise_details(
match promise.state() {
v8::PromiseState::Pending => {
- promise_details.set(
- context,
- v8::Integer::new(scope, 0).into(),
- v8::Integer::new(scope, 0).into(),
- );
+ let js_zero = v8::Integer::new(scope, 0);
+ promise_details.set(scope, js_zero.into(), js_zero.into());
rv.set(promise_details.into());
}
v8::PromiseState::Fulfilled => {
- promise_details.set(
- context,
- v8::Integer::new(scope, 0).into(),
- v8::Integer::new(scope, 1).into(),
- );
- promise_details.set(
- context,
- v8::Integer::new(scope, 1).into(),
- promise.result(scope),
- );
+ let js_zero = v8::Integer::new(scope, 0);
+ let js_one = v8::Integer::new(scope, 1);
+ let promise_result = promise.result(scope);
+ promise_details.set(scope, js_zero.into(), js_one.into());
+ promise_details.set(scope, js_one.into(), promise_result);
rv.set(promise_details.into());
}
v8::PromiseState::Rejected => {
- promise_details.set(
- context,
- v8::Integer::new(scope, 0).into(),
- v8::Integer::new(scope, 2).into(),
- );
- promise_details.set(
- context,
- v8::Integer::new(scope, 1).into(),
- promise.result(scope),
- );
+ let js_zero = v8::Integer::new(scope, 0);
+ let js_one = v8::Integer::new(scope, 1);
+ let js_two = v8::Integer::new(scope, 2);
+ let promise_result = promise.result(scope);
+ promise_details.set(scope, js_zero.into(), js_two.into());
+ promise_details.set(scope, js_one.into(), promise_result);
rv.set(promise_details.into());
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-31 21:24:00 +0000