diff options
author | Marcin Mielniczuk <marmistrz.dev@zoho.eu> | 2018-03-28 21:28:30 +0200 |
---|---|---|
committer | Marcin Mielniczuk <marmistrz.dev@zoho.eu> | 2018-03-28 21:28:30 +0200 |
commit | 356c57e628255ed338b32246ce5e7de75da621f0 (patch) | |
tree | e6b98e284bf4cabce6c0dfce8b593dc9c2f8a534 /components/script/dom/bindings/mozmap.rs | |
parent | e04d517bff695c03df7f0417a494c8286860bc3c (diff) | |
download | servo-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/mozmap.rs')
-rw-r--r-- | components/script/dom/bindings/mozmap.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/bindings/mozmap.rs b/components/script/dom/bindings/mozmap.rs index 19f65ec05f8..599207e95fb 100644 --- a/components/script/dom/bindings/mozmap.rs +++ b/components/script/dom/bindings/mozmap.rs @@ -6,19 +6,19 @@ use dom::bindings::conversions::jsid_to_string; use dom::bindings::str::DOMString; -use js::conversions::{FromJSValConvertible, ToJSValConvertible, ConversionResult}; -use js::jsapi::GetPropertyKeys; -use js::jsapi::HandleValue; +use js::conversions::{ConversionResult, FromJSValConvertible, ToJSValConvertible}; use js::jsapi::JSContext; use js::jsapi::JSITER_OWNONLY; use js::jsapi::JSPROP_ENUMERATE; -use js::jsapi::JS_DefineUCProperty2; -use js::jsapi::JS_GetPropertyById; use js::jsapi::JS_NewPlainObject; -use js::jsapi::MutableHandleValue; use js::jsval::ObjectValue; use js::jsval::UndefinedValue; +use js::rust::HandleValue; use js::rust::IdVector; +use js::rust::MutableHandleValue; +use js::rust::wrappers::GetPropertyKeys; +use js::rust::wrappers::JS_DefineUCProperty2; +use js::rust::wrappers::JS_GetPropertyById; use std::collections::HashMap; use std::ops::Deref; @@ -86,7 +86,7 @@ impl<T, C> FromJSValConvertible for MozMap<T> impl<T: ToJSValConvertible> ToJSValConvertible for MozMap<T> { #[inline] - unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { + unsafe fn to_jsval(&self, cx: *mut JSContext, mut rval: MutableHandleValue) { rooted!(in(cx) let js_object = JS_NewPlainObject(cx)); assert!(!js_object.handle().is_null()); |