Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update rust-mozjs to master.

Browse source
This commit is contained in:
Josh Matthews 2017-03-31 13:27:34 -04:00
parent b6bc49225e
commit 8cba0dff8b
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -1300,7 +1300,7 @@ dependencies = [
[[package]] [[package]]
name = "js" name = "js"
version = "0.1.4" version = "0.1.4"
source = "git+https://github.com/servo/rust-mozjs#101c6b6b58e0b7c5ed1ef2b6b676a7497f90df2f" source = "git+https://github.com/servo/rust-mozjs#7f380abcbe02604cca5f28ff4175dff2a4f5555e"
dependencies = [ dependencies = [
"cmake 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

2
components/script/script_runtime.rs
View file

@ -126,7 +126,7 @@ unsafe extern "C" fn enqueue_job(cx: *mut JSContext,
#[allow(unsafe_code)] #[allow(unsafe_code)]
pub unsafe fn new_rt_and_cx() -> Runtime { pub unsafe fn new_rt_and_cx() -> Runtime {
LiveDOMReferences::initialize(); LiveDOMReferences::initialize();
let runtime = Runtime::new(); let runtime = Runtime::new().unwrap();
JS_AddExtraGCRootsTracer(runtime.rt(), Some(trace_rust_roots), ptr::null_mut()); JS_AddExtraGCRootsTracer(runtime.rt(), Some(trace_rust_roots), ptr::null_mut());
JS_AddExtraGCRootsTracer(runtime.rt(), Some(trace_refcounted_objects), ptr::null_mut()); JS_AddExtraGCRootsTracer(runtime.rt(), Some(trace_refcounted_objects), ptr::null_mut());