naskya/napi-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(napi): remove useless handle_scope operation in async_work

Browse source
This commit is contained in:
LongYinan 2020-09-26 17:14:44 +08:00
parent 6dba7359dd
commit d3fdfd48d0
No known key found for this signature in database
GPG key ID: C3666B7FC82ADAD7
2 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
napi/src/async_work.rs
View file

@ -80,30 +80,14 @@ unsafe extern "C" fn complete<T: Task>(
let output = ptr::read(v as *const _); let output = ptr::read(v as *const _);
work.inner_task.resolve(&mut env, output) work.inner_task.resolve(&mut env, output)
}); });
let mut handle_scope = ptr::null_mut();
match check_status(status).and_then(move |_| value) { match check_status(status).and_then(move |_| value) {
Ok(v) => { Ok(v) => {
let open_handle_status = sys::napi_open_handle_scope(env, &mut handle_scope);
debug_assert!(
open_handle_status == sys::napi_status::napi_ok,
"OpenHandleScope failed"
);
let status = sys::napi_resolve_deferred(env, deferred, v.raw_value()); let status = sys::napi_resolve_deferred(env, deferred, v.raw_value());
debug_assert!(status == sys::napi_status::napi_ok, "Reject promise failed"); debug_assert!(status == sys::napi_status::napi_ok, "Reject promise failed");
} }
Err(e) => { Err(e) => {
let open_handle_status = sys::napi_open_handle_scope(env, &mut handle_scope);
debug_assert!(
open_handle_status == sys::napi_status::napi_ok,
"OpenHandleScope failed"
);
let status = sys::napi_reject_deferred(env, deferred, e.into_raw(env)); let status = sys::napi_reject_deferred(env, deferred, e.into_raw(env));
debug_assert!(status == sys::napi_status::napi_ok, "Reject promise failed"); debug_assert!(status == sys::napi_status::napi_ok, "Reject promise failed");
} }
}; };
let close_handle_scope_status = sys::napi_close_handle_scope(env, handle_scope);
debug_assert!(
close_handle_scope_status == sys::napi_status::napi_ok,
"Close handle scope failed"
);
} }

3
napi/src/env.rs
View file

@ -40,8 +40,7 @@ impl Env {
pub fn get_undefined(&self) -> Result<JsUndefined> { pub fn get_undefined(&self) -> Result<JsUndefined> {
let mut raw_value = ptr::null_mut(); let mut raw_value = ptr::null_mut();
let status = unsafe { sys::napi_get_undefined(self.0, &mut raw_value) }; check_status(unsafe { sys::napi_get_undefined(self.0, &mut raw_value) })?;
check_status(status)?;
Ok(JsUndefined::from_raw_unchecked(self.0, raw_value)) Ok(JsUndefined::from_raw_unchecked(self.0, raw_value))
} }