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

Auto merge of #16210 - jdm:updatejs, r=Wafflespeanut

Browse source 
Update rust-mozjs to master.

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #16152
- [X] There are tests for these changes

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16210)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-01 00:05:56 -05:00 • committed by GitHub
commit 2ebddca592
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/script_runtime.rs
View file

@ -126,7 +126,7 @@ unsafe extern "C" fn enqueue_job(cx: *mut JSContext,
#[allow(unsafe_code)]
pub unsafe fn new_rt_and_cx() -> Runtime {
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_refcounted_objects), ptr::null_mut());