Skip to content

fix: #[function_callback] can be used without javascriptcore_sys #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2023
Merged

fix: #[function_callback] can be used without javascriptcore_sys #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions javascriptcore-macros/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,15 @@ pub fn function_callback(_attributes: TokenStream, item: TokenStream) -> TokenSt

quote! {
unsafe extern "C" fn #function_name(
raw_ctx: javascriptcore_sys::JSContextRef,
function: javascriptcore_sys::JSObjectRef,
this_object: javascriptcore_sys::JSObjectRef,
raw_ctx: javascriptcore::sys::JSContextRef,
function: javascriptcore::sys::JSObjectRef,
this_object: javascriptcore::sys::JSObjectRef,
argument_count: usize,
arguments: *const javascriptcore_sys::JSValueRef,
exception: *mut javascriptcore_sys::JSValueRef,
) -> *const javascriptcore_sys::OpaqueJSValue {
arguments: *const javascriptcore::sys::JSValueRef,
exception: *mut javascriptcore::sys::JSValueRef,
) -> *const javascriptcore::sys::OpaqueJSValue {
use core::{mem::ManuallyDrop, ptr, slice};
use javascriptcore::{JSContext, JSObject, JSValue};
use javascriptcore_sys::JSValueRef;
use javascriptcore::{sys::JSValueRef, JSContext, JSObject, JSValue};

// This should never happen, it's simply a paranoid precaution.
if raw_ctx.is_null() {
Expand Down
3 changes: 2 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
)]

pub use javascriptcore_macros::function_callback;
use javascriptcore_sys as sys;
#[doc(hidden)]
pub use javascriptcore_sys as sys;

mod base;
mod class;
Expand Down