summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/ffi/lib.rs3
-rw-r--r--ext/flash/lib.rs9
-rw-r--r--ext/napi/function.rs9
3 files changed, 8 insertions, 13 deletions
diff --git a/ext/ffi/lib.rs b/ext/ffi/lib.rs
index 3ad75e245..3de204ef3 100644
--- a/ext/ffi/lib.rs
+++ b/ext/ffi/lib.rs
@@ -706,8 +706,7 @@ fn make_sync_fn<'s>(
|scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue| {
- let external: v8::Local<v8::External> =
- args.data().unwrap().try_into().unwrap();
+ let external: v8::Local<v8::External> = args.data().try_into().unwrap();
// SAFETY: The pointer will not be deallocated until the function is
// garbage collected.
let symbol = unsafe { &*(external.value() as *const Symbol) };
diff --git a/ext/flash/lib.rs b/ext/flash/lib.rs
index 17e3e8317..9cff7d2fc 100644
--- a/ext/flash/lib.rs
+++ b/ext/flash/lib.rs
@@ -539,8 +539,7 @@ fn op_flash_make_request<'scope>(
|_: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue| {
- let external: v8::Local<v8::External> =
- args.data().unwrap().try_into().unwrap();
+ let external: v8::Local<v8::External> = args.data().try_into().unwrap();
// SAFETY: This external is guaranteed to be a pointer to a ServerContext
let ctx = unsafe { &mut *(external.value() as *mut ServerContext) };
rv.set_uint32(next_request_sync(ctx));
@@ -561,8 +560,7 @@ fn op_flash_make_request<'scope>(
|scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue| {
- let external: v8::Local<v8::External> =
- args.data().unwrap().try_into().unwrap();
+ let external: v8::Local<v8::External> = args.data().try_into().unwrap();
// SAFETY: This external is guaranteed to be a pointer to a ServerContext
let ctx = unsafe { &mut *(external.value() as *mut ServerContext) };
let token = args.get(0).uint32_value(scope).unwrap();
@@ -585,8 +583,7 @@ fn op_flash_make_request<'scope>(
|scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue| {
- let external: v8::Local<v8::External> =
- args.data().unwrap().try_into().unwrap();
+ let external: v8::Local<v8::External> = args.data().try_into().unwrap();
// SAFETY: This external is guaranteed to be a pointer to a ServerContext
let ctx = unsafe { &mut *(external.value() as *mut ServerContext) };
diff --git a/ext/napi/function.rs b/ext/napi/function.rs
index 853283b08..edeed2566 100644
--- a/ext/napi/function.rs
+++ b/ext/napi/function.rs
@@ -27,13 +27,12 @@ impl CallbackInfo {
}
extern "C" fn call_fn(info: *const v8::FunctionCallbackInfo) {
- let args =
- unsafe { v8::FunctionCallbackArguments::from_function_callback_info(info) };
- let mut rv = unsafe { v8::ReturnValue::from_function_callback_info(info) };
+ let info = unsafe { &*info };
+ let args = v8::FunctionCallbackArguments::from_function_callback_info(info);
+ let mut rv = v8::ReturnValue::from_function_callback_info(info);
// SAFETY: create_function guarantees that the data is a CallbackInfo external.
let info_ptr: *mut CallbackInfo = unsafe {
- let external_value =
- v8::Local::<v8::External>::cast(args.data().unwrap_unchecked());
+ let external_value = v8::Local::<v8::External>::cast(args.data());
external_value.value() as _
};