servo: Merge #16210 - Update rust-mozjs to master (from jdm:updatejs); r=Wafflespeanut

- [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

Source-Repo: https://github.com/servo/servo
Source-Revision: 2ebddca5921230eafc25acaa5bf47c10756f3e51

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : de6f1ce0d879dbb173e8ae29b4d0572f3b1e278f
This commit is contained in:
Josh Matthews 2017-04-01 00:05:56 -05:00
Родитель c02d5a813c
Коммит 34cad3c4fd
2 изменённых файлов: 2 добавлений и 2 удалений

2
servo/Cargo.lock сгенерированный
Просмотреть файл

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

Просмотреть файл

@ -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());