aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/iterable.rs
diff options
context:
space:
mode:
authorMarcin Mielniczuk <marmistrz.dev@zoho.eu>2018-03-28 21:28:30 +0200
committerMarcin Mielniczuk <marmistrz.dev@zoho.eu>2018-03-28 21:28:30 +0200
commit356c57e628255ed338b32246ce5e7de75da621f0 (patch)
treee6b98e284bf4cabce6c0dfce8b593dc9c2f8a534 /components/script/dom/bindings/iterable.rs
parente04d517bff695c03df7f0417a494c8286860bc3c (diff)
downloadservo-356c57e628255ed338b32246ce5e7de75da621f0.tar.gz
servo-356c57e628255ed338b32246ce5e7de75da621f0.zip
Adapt Servo for mozjs 0.6 and the changes introduced in servo/rust-mozjs#393
Diffstat (limited to 'components/script/dom/bindings/iterable.rs')
-rw-r--r--components/script/dom/bindings/iterable.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/components/script/dom/bindings/iterable.rs b/components/script/dom/bindings/iterable.rs
index 60331f6608e..15ccd554c2a 100644
--- a/components/script/dom/bindings/iterable.rs
+++ b/components/script/dom/bindings/iterable.rs
@@ -15,8 +15,9 @@ use dom::bindings::trace::{JSTraceable, RootedTraceableBox};
use dom::globalscope::GlobalScope;
use dom_struct::dom_struct;
use js::conversions::ToJSValConvertible;
-use js::jsapi::{HandleValue, Heap, JSContext, MutableHandleObject, JSObject};
+use js::jsapi::{Heap, JSContext, JSObject};
use js::jsval::UndefinedValue;
+use js::rust::{HandleValue, MutableHandleObject};
use std::cell::Cell;
use std::ptr;
use std::ptr::NonNull;
@@ -111,7 +112,7 @@ impl<T: DomObject + JSTraceable + Iterable> IterableIterator<T> {
}
fn dict_return(cx: *mut JSContext,
- result: MutableHandleObject,
+ mut result: MutableHandleObject,
done: bool,
value: HandleValue) -> Fallible<()> {
let mut dict = unsafe { IterableKeyOrValueResult::empty(cx) };
@@ -126,7 +127,7 @@ fn dict_return(cx: *mut JSContext,
}
fn key_and_value_return(cx: *mut JSContext,
- result: MutableHandleObject,
+ mut result: MutableHandleObject,
key: HandleValue,
value: HandleValue) -> Fallible<()> {
let mut dict = unsafe { IterableKeyAndValueResult::empty(cx) };