foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-03 04:48:52 -05:00
Code Issues Packages 1 Wiki Activity

refactor(ext/ffi): use v8::Value instead of serde_v8::Value (#23035)

Browse source 
Follow up to https://github.com/denoland/deno/pull/23034 that removes
another usage of `serde_v8::Value`.
This commit is contained in:
Bartek Iwańczuk 2024-03-22 19:51:05 +00:00 committed by GitHub
parent 2d59372e7a
commit 9c2f9f14e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/ffi/dlfcn.rs
View file

@ -9,11 +9,9 @@ use crate::FfiPermissions;
use deno_core::error::generic_error; use deno_core::error::generic_error;
use deno_core::error::AnyError; use deno_core::error::AnyError;
use deno_core::op2; use deno_core::op2;
use deno_core::serde_v8;
use deno_core::v8; use deno_core::v8;
use deno_core::OpState; use deno_core::OpState;
use deno_core::Resource; use deno_core::Resource;
use deno_core::ResourceId;
use dlopen2::raw::Library; use dlopen2::raw::Library;
use serde::Deserialize; use serde::Deserialize;
use serde_value::ValueDeserializer; use serde_value::ValueDeserializer;
@ -132,12 +130,11 @@ pub struct FfiLoadArgs {
} }
#[op2] #[op2]
#[serde]
pub fn op_ffi_load<'scope, FP>( pub fn op_ffi_load<'scope, FP>(
scope: &mut v8::HandleScope<'scope>, scope: &mut v8::HandleScope<'scope>,
state: &mut OpState, state: &mut OpState,
#[serde] args: FfiLoadArgs, #[serde] args: FfiLoadArgs,
) -> Result<(ResourceId, serde_v8::Value<'scope>), AnyError> ) -> Result<v8::Local<'scope, v8::Value>, AnyError>
where where
FP: FfiPermissions + 'static, FP: FfiPermissions + 'static,
{ {
@ -222,13 +219,12 @@ where
} }
} }
let out = v8::Array::new(scope, 2);
let rid = state.resource_table.add(resource); let rid = state.resource_table.add(resource);
Ok(( let rid_v8 = v8::Integer::new_from_unsigned(scope, rid);
rid, out.set_index(scope, 0, rid_v8.into());
serde_v8::Value { out.set_index(scope, 1, obj.into());
v8_value: obj.into(), Ok(out.into())
},
))
} }
// Create a JavaScript function for synchronous FFI call to // Create a JavaScript function for synchronous FFI call to