Fix all the warnings (#562)

* Add oom-with-hook feature to Cargo Signed-off-by: Greg Morenz <greg-morenz@droid.cafe> * Remove unused import Signed-off-by: Greg Morenz <greg-morenz@droid.cafe> * Fix abi of EncodedStringCallback Signed-off-by: Greg Morenz <greg-morenz@droid.cafe> * Resolve ambiguous imports Signed-off-by: Greg Morenz <greg-morenz@droid.cafe> --------- Signed-off-by: Greg Morenz <greg-morenz@droid.cafe>
servo · Mar 6, 2025 · 2c59822 · 2c59822
1 parent 99518a4
commit 2c59822
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/mozjs-sys/Cargo.toml b/mozjs-sys/Cargo.toml
@@ -27,6 +27,7 @@ debugmozjs = []
 profilemozjs = []
 jitspew = []
 crown = []
+oom_with_hook = []
 
 [dependencies]
 libc.workspace = true

diff --git a/mozjs-sys/src/glue.rs b/mozjs-sys/src/glue.rs
@@ -11,7 +11,7 @@ use core::mem;
 
 pub use generated::root::*;
 
-pub type EncodedStringCallback = fn(*const core::ffi::c_char);
+pub type EncodedStringCallback = unsafe extern "C" fn(*const core::ffi::c_char);
 
 // manual glue stuff
 unsafe impl Sync for ProxyTraps {}

diff --git a/mozjs-sys/src/lib.rs b/mozjs-sys/src/lib.rs
@@ -5,6 +5,7 @@
 #![allow(unused_extern_crates)]
 #![cfg_attr(feature = "crown", feature(register_tool))]
 #![cfg_attr(feature = "crown", register_tool(crown))]
+#![cfg_attr(feature = "oom_with_hook", feature(alloc_error_hook))]
 
 // These extern crates are needed for linking
 extern crate encoding_c;

diff --git a/mozjs-sys/src/trace.rs b/mozjs-sys/src/trace.rs
@@ -32,7 +32,6 @@ use std::sync::atomic::{
     AtomicBool, AtomicI16, AtomicI32, AtomicI64, AtomicI8, AtomicIsize, AtomicU16, AtomicU32,
     AtomicU64, AtomicU8, AtomicUsize,
 };
-use std::sync::Arc;
 use std::thread::JoinHandle;
 use std::time::{Duration, Instant, SystemTime};
 

diff --git a/mozjs/src/lib.rs b/mozjs/src/lib.rs
@@ -31,6 +31,10 @@
 //!
 
 pub mod jsapi {
+    // Resolve ambiguous imports
+    pub use mozjs_sys::jsapi::js::detail;
+    pub use mozjs_sys::jsapi::JS::{FrontendContext, MemoryUse};
+
     pub use mozjs_sys::jsapi::glue::*;
     pub use mozjs_sys::jsapi::js::detail::*;
     pub use mozjs_sys::jsapi::js::*;

diff --git a/mozjs/tests/callback.rs b/mozjs/tests/callback.rs
@@ -64,12 +64,13 @@ unsafe extern "C" fn puts(context: *mut JSContext, argc: u32, vp: *mut Value) ->
     let arg = mozjs::rust::Handle::from_raw(args.get(0));
     let js = mozjs::rust::ToString(context, arg);
     rooted!(in(context) let message_root = js);
-    EncodeStringToUTF8(context, message_root.handle().into(), |message| {
+    unsafe extern "C" fn cb(message: *const core::ffi::c_char) {
         let message = CStr::from_ptr(message);
         let message = str::from_utf8(message.to_bytes()).unwrap();
         assert_eq!(message, "Test Iñtërnâtiônàlizætiøn ┬─┬ノ( º _ ºノ) ");
         println!("{}", message);
-    });
+    }
+    EncodeStringToUTF8(context, message_root.handle().into(), cb);
 
     args.rval().set(UndefinedValue());
     true