fix(napi-derive): import FromNapiValue and ToNapiValue from napi::bindgen_prelude when generating enum (#1713)

This commit is contained in:
Jez 2023-11-02 23:05:16 +08:00 committed by GitHub
parent 2c410b238d
commit afd3395bb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -62,7 +62,7 @@ impl NapiEnum {
env: napi::bindgen_prelude::sys::napi_env, env: napi::bindgen_prelude::sys::napi_env,
napi_val: napi::bindgen_prelude::sys::napi_value napi_val: napi::bindgen_prelude::sys::napi_value
) -> napi::bindgen_prelude::Result<Self> { ) -> napi::bindgen_prelude::Result<Self> {
let val = FromNapiValue::from_napi_value(env, napi_val).map_err(|e| { let val = napi::bindgen_prelude::FromNapiValue::from_napi_value(env, napi_val).map_err(|e| {
napi::bindgen_prelude::error!( napi::bindgen_prelude::error!(
e.status, e.status,
"Failed to convert napi value into enum `{}`. {}", "Failed to convert napi value into enum `{}`. {}",
@ -94,7 +94,7 @@ impl NapiEnum {
#(#to_napi_branches,)* #(#to_napi_branches,)*
}; };
ToNapiValue::to_napi_value(env, val) napi::bindgen_prelude::ToNapiValue::to_napi_value(env, val)
} }
} }
} }
@ -118,7 +118,7 @@ impl NapiEnum {
napi::bindgen_prelude::sys::napi_set_named_property( napi::bindgen_prelude::sys::napi_set_named_property(
env, env,
obj_ptr, name.as_ptr(), obj_ptr, name.as_ptr(),
ToNapiValue::to_napi_value(env, #val_lit)? napi::bindgen_prelude::ToNapiValue::to_napi_value(env, #val_lit)?
), ),
"Failed to defined enum `{}`", "Failed to defined enum `{}`",
#js_name_lit #js_name_lit