diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2023-05-18 16:17:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-18 16:17:53 +0200 |
commit | 26a64b4edda3c74e26ebec1d1f6af3ffa155012d (patch) | |
tree | 29a5941925e3c7a80f22f41449d3334de9611a00 /ext/napi/lib.rs | |
parent | b0f13560cb5a860df042649fbceb8cd728011b8b (diff) |
refactor(napi): simplify types (#19179)
This commit removes "Error" and "Result" structs from
"ext/napi". In turn all NAPI functions now return "napi_status"
instead of "napi::Result".
Diffstat (limited to 'ext/napi/lib.rs')
-rw-r--r-- | ext/napi/lib.rs | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/ext/napi/lib.rs b/ext/napi/lib.rs index 8365a5692..32f8c52fc 100644 --- a/ext/napi/lib.rs +++ b/ext/napi/lib.rs @@ -101,95 +101,6 @@ pub struct NapiModule { reserved: [*mut c_void; 4], } -#[derive(Debug, Clone, PartialEq, Eq)] -pub enum Error { - InvalidArg, - ObjectExpected, - StringExpected, - NameExpected, - FunctionExpected, - NumberExpected, - BooleanExpected, - ArrayExpected, - GenericFailure, - PendingException, - Cancelled, - EscapeCalledTwice, - HandleScopeMismatch, - CallbackScopeMismatch, - QueueFull, - Closing, - BigIntExpected, - DateExpected, - ArrayBufferExpected, - DetachableArraybufferExpected, - WouldDeadlock, -} - -#[allow(clippy::from_over_into)] -impl Into<Error> for napi_status { - fn into(self) -> Error { - match self { - napi_invalid_arg => Error::InvalidArg, - napi_object_expected => Error::ObjectExpected, - napi_string_expected => Error::StringExpected, - napi_name_expected => Error::NameExpected, - napi_function_expected => Error::FunctionExpected, - napi_number_expected => Error::NumberExpected, - napi_boolean_expected => Error::BooleanExpected, - napi_array_expected => Error::ArrayExpected, - napi_generic_failure => Error::GenericFailure, - napi_pending_exception => Error::PendingException, - napi_cancelled => Error::Cancelled, - napi_escape_called_twice => Error::EscapeCalledTwice, - napi_handle_scope_mismatch => Error::HandleScopeMismatch, - napi_callback_scope_mismatch => Error::CallbackScopeMismatch, - napi_queue_full => Error::QueueFull, - napi_closing => Error::Closing, - napi_bigint_expected => Error::BigIntExpected, - napi_date_expected => Error::DateExpected, - napi_arraybuffer_expected => Error::ArrayBufferExpected, - napi_detachable_arraybuffer_expected => { - Error::DetachableArraybufferExpected - } - napi_would_deadlock => Error::WouldDeadlock, - _ => unreachable!(), - } - } -} - -pub type Result = std::result::Result<(), Error>; - -impl From<Error> for napi_status { - fn from(error: Error) -> Self { - match error { - Error::InvalidArg => napi_invalid_arg, - Error::ObjectExpected => napi_object_expected, - Error::StringExpected => napi_string_expected, - Error::NameExpected => napi_name_expected, - Error::FunctionExpected => napi_function_expected, - Error::NumberExpected => napi_number_expected, - Error::BooleanExpected => napi_boolean_expected, - Error::ArrayExpected => napi_array_expected, - Error::GenericFailure => napi_generic_failure, - Error::PendingException => napi_pending_exception, - Error::Cancelled => napi_cancelled, - Error::EscapeCalledTwice => napi_escape_called_twice, - Error::HandleScopeMismatch => napi_handle_scope_mismatch, - Error::CallbackScopeMismatch => napi_callback_scope_mismatch, - Error::QueueFull => napi_queue_full, - Error::Closing => napi_closing, - Error::BigIntExpected => napi_bigint_expected, - Error::DateExpected => napi_date_expected, - Error::ArrayBufferExpected => napi_arraybuffer_expected, - Error::DetachableArraybufferExpected => { - napi_detachable_arraybuffer_expected - } - Error::WouldDeadlock => napi_would_deadlock, - } - } -} - pub type napi_valuetype = i32; pub const napi_undefined: napi_valuetype = 0; |