Auto merge of #540 - sagudev:master, r=jdm

Update mozjs to 87

servo/mozjs#275

Author: bors-servo

Cargo.toml

@@ -58,4 +58,4 @@ lazy_static = "1"
 libc = "0.2"
 log = "0.4"
 num-traits = "0.2"
-mozjs_sys = { git = "https://github.com/servo/mozjs", rev = "82da136c53d7ca7b0b7fe1c5622627036ef31899" }
+mozjs_sys = { git = "https://github.com/servo/mozjs", rev="95387f7235ae9ba950a8dbebb850f41709ff5b1d" }

src/glue.rs

@@ -322,39 +322,39 @@ extern "C" {
     pub fn GetProxyHandlerFamily() -> *const c_void;
 
     pub fn GetInt8ArrayLengthAndData(obj: *mut JSObject,
-                                     length: *mut u32,
+                                     length: *mut usize,
                                      isSharedMemory: *mut bool,
                                      data: *mut *mut i8);
     pub fn GetUint8ArrayLengthAndData(obj: *mut JSObject,
-                                      length: *mut u32,
+                                      length: *mut usize,
                                       isSharedMemory: *mut bool,
                                       data: *mut *mut u8);
     pub fn GetUint8ClampedArrayLengthAndData(obj: *mut JSObject,
-                                             length: *mut u32,
+                                             length: *mut usize,
                                              isSharedMemory: *mut bool,
                                              data: *mut *mut u8);
     pub fn GetInt16ArrayLengthAndData(obj: *mut JSObject,
-                                      length: *mut u32,
+                                      length: *mut usize,
                                       isSharedMemory: *mut bool,
                                       data: *mut *mut i16);
     pub fn GetUint16ArrayLengthAndData(obj: *mut JSObject,
-                                       length: *mut u32,
+                                       length: *mut usize,
                                        isSharedMemory: *mut bool,
                                        data: *mut *mut u16);
     pub fn GetInt32ArrayLengthAndData(obj: *mut JSObject,
-                                      length: *mut u32,
+                                      length: *mut usize,
                                       isSharedMemory: *mut bool,
                                       data: *mut *mut i32);
     pub fn GetUint32ArrayLengthAndData(obj: *mut JSObject,
-                                       length: *mut u32,
+                                       length: *mut usize,
                                        isSharedMemory: *mut bool,
                                        data: *mut *mut u32);
     pub fn GetFloat32ArrayLengthAndData(obj: *mut JSObject,
-                                        length: *mut u32,
+                                        length: *mut usize,
                                         isSharedMemory: *mut bool,
                                         data: *mut *mut f32);
     pub fn GetFloat64ArrayLengthAndData(obj: *mut JSObject,
-                                        length: *mut u32,
+                                        length: *mut usize,
                                         isSharedMemory: *mut bool,
                                         data: *mut *mut f64);
 

src/jsglue.cpp

@@ -657,15 +657,13 @@ NewProxyObject(JSContext* aCx, const void* aHandler, JS::HandleValue aPriv,
 
 JSObject*
 WrapperNew(JSContext* aCx, JS::HandleObject aObj, const void* aHandler,
-           const JSClass* aClass, bool aSingleton)
+           const JSClass* aClass)
 {
     js::WrapperOptions options;
     if (aClass) {
         options.setClass(aClass);
     }
-    if (aSingleton) {
-      return js::Wrapper::NewSingleton(aCx, aObj, (const js::Wrapper*)aHandler, options);
-    }
+
     return js::Wrapper::New(aCx, aObj, (const js::Wrapper*)aHandler, options);
 }
 
@@ -682,7 +680,7 @@ GetWindowProxyClass()
 JSObject*
 NewWindowProxy(JSContext* aCx, JS::HandleObject aObj, const void* aHandler)
 {
-    return WrapperNew(aCx, aObj, aHandler, &WindowProxyClass, true);
+    return WrapperNew(aCx, aObj, aHandler, &WindowProxyClass);
 }
 
 void
@@ -1010,7 +1008,7 @@ IsDebugBuild()
 
 #define JS_DEFINE_DATA_AND_LENGTH_ACCESSOR(Type, type)                         \
     void                                                                       \
-    Get ## Type ## ArrayLengthAndData(JSObject* obj, uint32_t* length,         \
+    Get ## Type ## ArrayLengthAndData(JSObject* obj, size_t* length,         \
                                       bool* isSharedMemory, type** data)       \
     {                                                                          \
         js::Get ## Type ## ArrayLengthAndData(obj, length, isSharedMemory,     \

src/typedarray.rs

@@ -111,14 +111,14 @@ impl<T: TypedArrayElement, S: JSObjectStorage> ToJSValConvertible for TypedArray
 }
 
 pub enum CreateWith<'a, T: 'a> {
-    Length(u32),
+    Length(usize),
     Slice(&'a [T]),
 }
 
 /// A typed array wrapper.
 pub struct TypedArray<T: TypedArrayElement, S: JSObjectStorage> {
     object: S,
-    computed: Cell<Option<(*mut T::Element, u32)>>,
+    computed: Cell<Option<(*mut T::Element, usize)>>,
 }
 
 unsafe impl<T> CustomTrace for TypedArray<T, *mut JSObject> where T: TypedArrayElement {
@@ -148,7 +148,7 @@ impl<T: TypedArrayElement, S: JSObjectStorage> TypedArray<T, S> {
         }
     }
 
-    fn data(&self) -> (*mut T::Element, u32) {
+    fn data(&self) -> (*mut T::Element, usize) {
         if let Some(data) = self.computed.get() {
             return data;
         }
@@ -224,7 +224,7 @@ impl<T: TypedArrayElementCreator + TypedArrayElement, S: JSObjectStorage> TypedA
                          -> Result<(), ()> {
         let length = match with {
             CreateWith::Length(len) => len,
-            CreateWith::Slice(slice) => slice.len() as u32,
+            CreateWith::Slice(slice) => slice.len(),
         };
 
         result.set(T::create_new(cx, length));
@@ -259,13 +259,13 @@ pub trait TypedArrayElement {
     /// Unwrap a typed array JS reflector for this element type.
     unsafe fn unwrap_array(obj: *mut JSObject) -> *mut JSObject;
     /// Retrieve the length and data of a typed array's buffer for this element type.
-    unsafe fn length_and_data(obj: *mut JSObject) -> (*mut Self::Element, u32);
+    unsafe fn length_and_data(obj: *mut JSObject) -> (*mut Self::Element, usize);
 }
 
 /// Internal trait for creating new typed arrays.
 pub trait TypedArrayElementCreator: TypedArrayElement {
     /// Create a new typed array.
-    unsafe fn create_new(cx: *mut JSContext, length: u32) -> *mut JSObject;
+    unsafe fn create_new(cx: *mut JSContext, length: usize) -> *mut JSObject;
     /// Get the data.
     unsafe fn get_data(obj: *mut JSObject) -> *mut Self::Element;
 }
@@ -284,7 +284,7 @@ macro_rules! typed_array_element {
                 $unwrap(obj)
             }
 
-            unsafe fn length_and_data(obj: *mut JSObject) -> (*mut Self::Element, u32) {
+            unsafe fn length_and_data(obj: *mut JSObject) -> (*mut Self::Element, usize) {
                 let mut len = 0;
                 let mut shared = false;
                 let mut data = ptr::null_mut();
@@ -304,7 +304,7 @@ macro_rules! typed_array_element {
         typed_array_element!($t, $element, $unwrap, $length_and_data);
 
         impl TypedArrayElementCreator for $t {
-            unsafe fn create_new(cx: *mut JSContext, length: u32) -> *mut JSObject {
+            unsafe fn create_new(cx: *mut JSContext, length: usize) -> *mut JSObject {
                 $create_new(cx, length)
             }