Skip to content

Commit 3f87cd6

Browse files
sys 0.12
1 parent 1d084af commit 3f87cd6

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ backtrace = "0.3"
3131

3232
#libquickjs-sys = {package="hirofa-quickjs-sys", git='https://github.com/HiRoFa/quickjs-sys'}
3333
#libquickjs-sys = { package = "hirofa-quickjs-sys", path = '../quickjs-sys', default-features = false }
34-
libquickjs-sys = { package = "hirofa-quickjs-sys", version = "0.11", default-features = false }
34+
libquickjs-sys = { package = "hirofa-quickjs-sys", version = "0.12", default-features = false }
3535
lazy_static = "1.5.0"
3636
log = "0.4"
3737
num_cpus = "1"

src/quickjs_utils/errors.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ pub fn is_error_q(q_ctx: &QuickJsRealmAdapter, obj_ref: &QuickJsValueAdapter) ->
142142
/// See if a JSValueRef is an Error object
143143
/// # Safety
144144
/// When passing a context pointer please make sure the corresponding QuickJsContext is still valid
145+
#[allow(unused_variables)]
145146
pub unsafe fn is_error(context: *mut q::JSContext, obj_ref: &QuickJsValueAdapter) -> bool {
146147
if obj_ref.is_object() {
147148
#[cfg(feature = "bellard")]
@@ -151,7 +152,7 @@ pub unsafe fn is_error(context: *mut q::JSContext, obj_ref: &QuickJsValueAdapter
151152
}
152153
#[cfg(feature = "quickjs-ng")]
153154
{
154-
q::JS_IsError(context, *obj_ref.borrow_value())
155+
q::JS_IsError(*obj_ref.borrow_value())
155156
}
156157
} else {
157158
false

src/quickjs_utils/functions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ where
660660

661661
let callback_class_id = CALLBACK_CLASS_ID.with(|rc| *rc.borrow());
662662

663-
let class_val: q::JSValue = q::JS_NewObjectClass(context, callback_class_id as i32);
663+
let class_val: q::JSValue = q::JS_NewObjectClass(context, callback_class_id as _);
664664

665665
let class_val_ref = QuickJsValueAdapter::new(
666666
context,

src/quickjs_utils/sets.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
//! see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Sap) for more on Sets
33
44
use crate::jsutils::JsError;
5+
#[cfg(feature = "bellard")]
56
use crate::quickjs_utils::class_ids::JS_CLASS_SET;
67
use crate::quickjs_utils::objects::construct_object;
78
use crate::quickjs_utils::{functions, get_constructor, iterators, objects, primitives};
89
use crate::quickjsrealmadapter::QuickJsRealmAdapter;
910
use crate::quickjsvalueadapter::QuickJsValueAdapter;
1011
use libquickjs_sys as q;
12+
#[cfg(feature = "bellard")]
1113
use libquickjs_sys::JS_GetClassID;
14+
#[cfg(feature = "quickjs-ng")]
15+
use libquickjs_sys::JS_IsSet;
1216

1317
/// create new instance of Set
1418
/// # Example
@@ -44,7 +48,11 @@ pub fn is_set_q(obj: &QuickJsValueAdapter) -> bool {
4448
/// # Safety
4549
/// please ensure the passed JSContext is still valid
4650
pub unsafe fn is_set(obj: &QuickJsValueAdapter) -> bool {
47-
JS_GetClassID(*obj.borrow_value()) == JS_CLASS_SET
51+
#[cfg(feature = "bellard")]
52+
return JS_GetClassID(*obj.borrow_value()) == JS_CLASS_SET;
53+
54+
#[cfg(feature = "quickjs-ng")]
55+
return JS_IsSet(*obj.borrow_value());
4856
}
4957

5058
/// add a value to the Set

src/reflection/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ impl Proxy {
649649
log::trace!("reflection::Proxy::install_class_prop / 3");
650650

651651
let class_val: q::JSValue =
652-
unsafe { q::JS_NewObjectClass(q_ctx.context, static_class_id as i32) };
652+
unsafe { q::JS_NewObjectClass(q_ctx.context, static_class_id as _) };
653653

654654
log::trace!("reflection::Proxy::install_class_prop / 4");
655655

@@ -834,7 +834,7 @@ pub(crate) fn new_instance3(
834834
let ctx = q_ctx.context;
835835
let class_id = PROXY_INSTANCE_CLASS_ID.with(|rc| *rc.borrow());
836836

837-
let class_val: q::JSValue = unsafe { q::JS_NewObjectClass(ctx, class_id as i32) };
837+
let class_val: q::JSValue = unsafe { q::JS_NewObjectClass(ctx, class_id as _) };
838838

839839
let class_name = proxy.get_class_name();
840840

0 commit comments

Comments
 (0)