From d3b2d4a8de4ad029c9183f880bdc881a178e3b52 Mon Sep 17 00:00:00 2001 From: LongYinan Date: Tue, 22 Nov 2022 11:50:12 +0800 Subject: [PATCH] chore(napi-derive): make_ref tweaks --- crates/backend/src/codegen/fn.rs | 14 ++++++++------ examples/napi/__test__/typegen.spec.ts.md | 1 - examples/napi/__test__/typegen.spec.ts.snap | Bin 3614 -> 3602 bytes examples/napi/__test__/values.spec.ts | 7 ------- examples/napi/index.d.ts | 1 - examples/napi/src/lib.rs | 1 - examples/napi/src/tokio_outside_async.rs | 18 ------------------ 7 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 examples/napi/src/tokio_outside_async.rs diff --git a/crates/backend/src/codegen/fn.rs b/crates/backend/src/codegen/fn.rs index 00f268f0e5..7ccff0ddcf 100644 --- a/crates/backend/src/codegen/fn.rs +++ b/crates/backend/src/codegen/fn.rs @@ -61,13 +61,12 @@ impl TryToTokens for NapiFn { unsafe impl Sync for NapiRefContainer {} let _make_ref = |a: ::std::ptr::NonNull| { let mut node_ref = ::std::mem::MaybeUninit::uninit(); - assert_eq!(unsafe { - napi::bindgen_prelude::sys::napi_create_reference(env, a.as_ptr(), 1, node_ref.as_mut_ptr()) + napi::bindgen_prelude::check_status!(unsafe { + napi::bindgen_prelude::sys::napi_create_reference(env, a.as_ptr(), 0, node_ref.as_mut_ptr()) }, - napi::bindgen_prelude::sys::Status::napi_ok, "failed to create napi ref" - ); - unsafe { node_ref.assume_init() } + )?; + Ok::(unsafe { node_ref.assume_init() }) }; let mut _args_array = [::std::ptr::null_mut::(); #arg_ref_count]; let mut _arg_write_index = 0; @@ -184,7 +183,10 @@ impl NapiFn { let mut mut_ref_spans = vec![]; let make_ref = |input| { quote! { - _args_array[_arg_write_index] = _make_ref(::std::ptr::NonNull::new(#input).expect("ref ptr was null")); + _args_array[_arg_write_index] = _make_ref( + ::std::ptr::NonNull::new(#input) + .ok_or_else(|| napi::Error::new(napi::Status::InvalidArg, "referenced ptr is null".to_owned()))? + )?; _arg_write_index += 1; } }; diff --git a/examples/napi/__test__/typegen.spec.ts.md b/examples/napi/__test__/typegen.spec.ts.md index 71a27146a4..1e758c2ba7 100644 --- a/examples/napi/__test__/typegen.spec.ts.md +++ b/examples/napi/__test__/typegen.spec.ts.md @@ -195,7 +195,6 @@ Generated by [AVA](https://avajs.dev). export function threadsafeFunctionFatalMode(cb: (...args: any[]) => any): void␊ export function threadsafeFunctionFatalModeError(cb: (...args: any[]) => any): void␊ export function threadsafeFunctionClosureCapture(func: (...args: any[]) => any): void␊ - export function useTokioWithoutAsync(): void␊ export function getBuffer(): Buffer␊ export function appendBuffer(buf: Buffer): Buffer␊ export function getEmptyBuffer(): Buffer␊ diff --git a/examples/napi/__test__/typegen.spec.ts.snap b/examples/napi/__test__/typegen.spec.ts.snap index 2bcb9a7bd40ef7b07e088045ff27030340b63285..d6b3df0b0717a738faafc5b064e52ad4a9c88e12 100644 GIT binary patch delta 3592 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 delta 3604 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 a3@fe{+hzLA%KO~gd;bGWY>joaGXMbR8T_pP diff --git a/examples/napi/__test__/values.spec.ts b/examples/napi/__test__/values.spec.ts index 4465ad986f..af98615a87 100644 --- a/examples/napi/__test__/values.spec.ts +++ b/examples/napi/__test__/values.spec.ts @@ -106,7 +106,6 @@ import { receiveObjectWithClassField, AnotherClassForEither, receiveDifferentClass, - useTokioWithoutAsync, getNumArr, getNestedNumArr, CustomFinalize, @@ -754,12 +753,6 @@ Napi4Test('await Promise in rust', async (t) => { t.is(result, fx + 100) }) -Napi4Test('Run function which uses tokio internally but is not async', (t) => { - useTokioWithoutAsync() - // The prior didn't throw an exception, so it worked. - t.assert(true) -}) - Napi4Test('Promise should reject raw error in rust', async (t) => { const fxError = new Error('What is Happy Planet') const err = await t.throwsAsync(() => asyncPlus100(Promise.reject(fxError))) diff --git a/examples/napi/index.d.ts b/examples/napi/index.d.ts index dacaa6b9b2..9cadb8a71f 100644 --- a/examples/napi/index.d.ts +++ b/examples/napi/index.d.ts @@ -185,7 +185,6 @@ export function threadsafeFunctionThrowError(cb: (...args: any[]) => any): void export function threadsafeFunctionFatalMode(cb: (...args: any[]) => any): void export function threadsafeFunctionFatalModeError(cb: (...args: any[]) => any): void export function threadsafeFunctionClosureCapture(func: (...args: any[]) => any): void -export function useTokioWithoutAsync(): void export function getBuffer(): Buffer export function appendBuffer(buf: Buffer): Buffer export function getEmptyBuffer(): Buffer diff --git a/examples/napi/src/lib.rs b/examples/napi/src/lib.rs index 48f23ca502..d50f516e26 100644 --- a/examples/napi/src/lib.rs +++ b/examples/napi/src/lib.rs @@ -40,5 +40,4 @@ mod string; mod symbol; mod task; mod threadsafe_function; -mod tokio_outside_async; mod typed_array; diff --git a/examples/napi/src/tokio_outside_async.rs b/examples/napi/src/tokio_outside_async.rs deleted file mode 100644 index b82a308b56..0000000000 --- a/examples/napi/src/tokio_outside_async.rs +++ /dev/null @@ -1,18 +0,0 @@ -use std::time::Duration; -use tokio::{sync::oneshot, time::Instant}; - -#[napi] -pub fn use_tokio_without_async() { - let (sender, receiver) = oneshot::channel(); - let handle = tokio::task::spawn(async { - // If this panics, the test failed. - sender.send(true).unwrap(); - }); - let start = Instant::now(); - while !handle.is_finished() { - if start.elapsed() > Duration::from_secs(5) { - panic!("The future never resolved."); - } - } - assert_eq!(receiver.blocking_recv(), Ok(true)); -}