Fix the tests and MutableHandle::handle

Author: marmistrz

src/rust.rs

@@ -668,6 +668,7 @@ macro_rules! auto_root {
     }
 }
 
+#[derive(Clone, Copy)]
 pub struct Handle<'a, T: 'a> {
     ptr: &'a T,
 }
@@ -677,6 +678,7 @@ pub struct MutableHandle<'a, T: 'a> {
 }
 
 pub type MutableHandleValue<'a> = MutableHandle<'a, Value>;
+pub type MutableHandleObject<'a> = MutableHandle<'a, *mut JSObject>;
 
 pub type HandleValue<'a> = Handle<'a, Value>;
 pub type HandleObject<'a> = Handle<'a, *mut JSObject>;
@@ -773,10 +775,8 @@ impl<'a, T> MutableHandle<'a, T> {
         RawMutableHandle::from_marked_location(ptr).into()
     }
 
-    pub fn handle(&self) -> RawHandle<T> {
-        unsafe {
-            RawHandle::from_marked_location(self.ptr as *const T)
-        }
+    pub fn handle(&self) -> Handle<T> {
+        Handle::new(self.ptr)
     }
 
     pub fn new(ptr: &'a mut T) -> Self {
@@ -795,7 +795,7 @@ impl<'a, T> MutableHandle<'a, T> {
         *self.ptr = v
     }
 
-    pub fn raw(&mut self) -> RawMutableHandle<T> {
+    fn raw(&mut self) -> RawMutableHandle<T> {
         unsafe {
             RawMutableHandle::from_marked_location(self.ptr)
         }

src/typedarray.rs

@@ -17,7 +17,6 @@ use glue::GetUint8ArrayLengthAndData;
 use glue::GetUint8ClampedArrayLengthAndData;
 use jsapi::GetArrayBufferLengthAndData;
 use jsapi::GetArrayBufferViewLengthAndData;
-use jsapi::HandleObject;
 use jsapi::JSContext;
 use jsapi::JSObject;
 use jsapi::JS_GetArrayBufferData;
@@ -41,7 +40,6 @@ use jsapi::JS_NewUint16Array;
 use jsapi::JS_NewUint32Array;
 use jsapi::JS_NewUint8Array;
 use jsapi::JS_NewUint8ClampedArray;
-use jsapi::MutableHandleObject;
 use jsapi::Rooted;
 use jsapi::Type;
 use jsapi::UnwrapArrayBuffer;
@@ -55,7 +53,7 @@ use jsapi::UnwrapUint16Array;
 use jsapi::UnwrapUint32Array;
 use jsapi::UnwrapUint8Array;
 use jsapi::UnwrapUint8ClampedArray;
-use rust::RootedGuard;
+use rust::{HandleObject, MutableHandleObject, RootedGuard};
 use std::ptr;
 use std::slice;
 
@@ -133,7 +131,7 @@ impl<'a, T: TypedArrayElementCreator + TypedArrayElement> TypedArray<'a, T> {
     /// be copied into the newly-allocated buffer. Returns the new JS reflector.
     pub unsafe fn create(cx: *mut JSContext,
                          with: CreateWith<T::Element>,
-                         result: MutableHandleObject)
+                         mut result: MutableHandleObject)
                          -> Result<(), ()> {
         let length = match with {
             CreateWith::Length(len) => len,

tests/callback.rs

@@ -35,7 +35,7 @@ fn callback() {
         rooted!(in(context) let global_root = global);
         let global = global_root.handle();
         let _ac = JSAutoCompartment::new(context, global.get());
-        let function = JS_DefineFunction(context, global, b"puts\0".as_ptr() as *const libc::c_char,
+        let function = JS_DefineFunction(context, global.into(), b"puts\0".as_ptr() as *const libc::c_char,
                                          Some(puts), 1, 0);
         assert!(!function.is_null());
         let javascript = "puts('Test Iñtërnâtiônàlizætiøn ┬─┬ノ( º _ ºノ) ');";
@@ -55,7 +55,7 @@ unsafe extern "C" fn puts(context: *mut JSContext, argc: u32, vp: *mut Value) ->
     let arg = args.get(0);
     let js = mozjs::rust::ToString(context, arg);
     rooted!(in(context) let message_root = js);
-    let message = JS_EncodeStringToUTF8(context, message_root.handle());
+    let message = JS_EncodeStringToUTF8(context, message_root.handle().into());
     let message = CStr::from_ptr(message);
     println!("{}", str::from_utf8(message.to_bytes()).unwrap());
 

tests/capture_stack.rs

@@ -31,7 +31,7 @@ fn capture_stack() {
         rooted!(in(context) let global_root = global);
         let global = global_root.handle();
         let _ac = JSAutoCompartment::new(context, global.get());
-        let function = JS_DefineFunction(context, global, b"print_stack\0".as_ptr() as *const libc::c_char,
+        let function = JS_DefineFunction(context, global.into(), b"print_stack\0".as_ptr() as *const libc::c_char,
                                          Some(print_stack), 0, 0);
         assert!(!function.is_null());
         let javascript = "

tests/enumerate.rs

@@ -38,13 +38,13 @@ fn enumerate() {
 
         rooted!(in(cx) let object = rval.to_object());
         let ids = IdVector::new(cx);
-        assert!(GetPropertyKeys(cx, object.handle(), JSITER_OWNONLY, ids.get()));
+        assert!(GetPropertyKeys(cx, object.handle().into(), JSITER_OWNONLY, ids.get()));
 
         assert_eq!(ids.len(), 1);
         rooted!(in(cx) let id = ids[0]);
 
-        assert!(RUST_JSID_IS_STRING(id.handle()));
-        rooted!(in(cx) let id = RUST_JSID_TO_STRING(id.handle()));
+        assert!(RUST_JSID_IS_STRING(id.handle().into()));
+        rooted!(in(cx) let id = RUST_JSID_TO_STRING(id.handle().into()));
 
         let mut matches = false;
         assert!(JS_StringEqualsAscii(cx,

tests/panic.rs

@@ -31,7 +31,7 @@ fn panic() {
         rooted!(in(context) let global_root = global);
         let global = global_root.handle();
         let _ac = JSAutoCompartment::new(context, global.get());
-        let function = JS_DefineFunction(context, global,
+        let function = JS_DefineFunction(context, global.into(),
                                          b"test\0".as_ptr() as *const _,
                                          Some(test), 0, 0);
         assert!(!function.is_null());

tests/vec_conversion.rs

@@ -34,7 +34,7 @@ fn vec_conversion() {
         let global = global_root.handle();
 
         let _ac = JSAutoCompartment::new(cx, global.get());
-        assert!(JS_InitStandardClasses(cx, global));
+        assert!(JS_InitStandardClasses(cx, global.into()));
 
         rooted!(in(cx) let mut rval = UndefinedValue());