diff options
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 10 | ||||
| -rw-r--r-- | components/script/dom/bindings/conversions.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/bindings/mozmap.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/bindings/proxyhandler.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/filereader.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/promise.rs | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index b65d2e65cdb..37d4eb0f892 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -2936,7 +2936,7 @@ assert!(!unforgeable_holder.is_null()); code.append(InitUnforgeablePropertiesOnHolder(self.descriptor, self.properties)) code.append(CGGeneric("""\ JS_SetReservedSlot(prototype.get(), DOM_PROTO_UNFORGEABLE_HOLDER_SLOT, - ObjectValue(&*unforgeable_holder.get()))""")) + ObjectValue(unforgeable_holder.get()))""")) return CGList(code, "\n") @@ -6607,7 +6607,7 @@ class CallCallback(CallbackMethod): return "aThisObj.get()" def getCallableDecl(self): - return "rooted!(in(cx) let callable = ObjectValue(&*self.parent.callback()));\n" + return "rooted!(in(cx) let callable = ObjectValue(self.parent.callback()));\n" def getCallGuard(self): if self.callback._treatNonObjectAsNull: @@ -6646,7 +6646,7 @@ class CallbackOperationBase(CallbackMethod): 'rooted!(in(cx) let callable =\n' + CGIndenter( CGIfElseWrapper('isCallable', - CGGeneric('ObjectValue(&*self.parent.callback())'), + CGGeneric('ObjectValue(self.parent.callback())'), CGGeneric(getCallableFromProp))).define() + ');\n') def getCallGuard(self): @@ -6734,10 +6734,10 @@ class CGIterableMethodGenerator(CGGeneric): throw_type_error(cx, "Argument 1 of ${ifaceName}.forEach is not callable."); return false; } - rooted!(in(cx) let arg0 = ObjectValue(&*arg0)); + rooted!(in(cx) let arg0 = ObjectValue(arg0)); rooted!(in(cx) let mut call_arg1 = UndefinedValue()); rooted!(in(cx) let mut call_arg2 = UndefinedValue()); - let mut call_args = vec![UndefinedValue(), UndefinedValue(), ObjectValue(&**_obj)]; + let mut call_args = vec![UndefinedValue(), UndefinedValue(), ObjectValue(*_obj)]; rooted!(in(cx) let mut ignoredReturnVal = UndefinedValue()); for i in 0..(*this).get_iterable_length() { (*this).get_value_at_index(i).to_jsval(cx, call_arg1.handle_mut()); diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs index db723ad141c..9143c9cb75b 100644 --- a/components/script/dom/bindings/conversions.rs +++ b/components/script/dom/bindings/conversions.rs @@ -310,9 +310,9 @@ impl ToJSValConvertible for Reflector { assert!(!obj.is_null()); let same_compartment = IsObjectInContextCompartment(obj, cx); if same_compartment { - rval.set(ObjectValue(&*ToWindowProxyIfWindow(obj))); + rval.set(ObjectValue(ToWindowProxyIfWindow(obj))); } else { - rval.set(ObjectValue(&*obj)); + rval.set(ObjectValue(obj)); if !JS_WrapValue(cx, rval) { panic!("JS_WrapValue failed."); diff --git a/components/script/dom/bindings/mozmap.rs b/components/script/dom/bindings/mozmap.rs index d44114cd057..5ef102539b7 100644 --- a/components/script/dom/bindings/mozmap.rs +++ b/components/script/dom/bindings/mozmap.rs @@ -105,6 +105,6 @@ impl<T: ToJSValConvertible> ToJSValConvertible for MozMap<T> { None)); } - rval.set(ObjectValue(&*js_object.handle().get())); + rval.set(ObjectValue(js_object.handle().get())); } } diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs index b5230b1b81a..cc4e535e4f2 100644 --- a/components/script/dom/bindings/proxyhandler.rs +++ b/components/script/dom/bindings/proxyhandler.rs @@ -178,7 +178,7 @@ pub fn ensure_expando_object(cx: *mut JSContext, obj: HandleObject) -> *mut JSOb expando = JS_NewObjectWithGivenProto(cx, ptr::null_mut(), HandleObject::null()); assert!(!expando.is_null()); - SetProxyExtra(obj.get(), JSPROXYSLOT_EXPANDO, &ObjectValue(&*expando)); + SetProxyExtra(obj.get(), JSPROXYSLOT_EXPANDO, &ObjectValue(expando)); } expando } diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index d9fd00630de..72ada5a03de 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -274,7 +274,7 @@ impl FileReader { *result.borrow_mut() = Some(FileReaderResult::ArrayBuffer(Heap::default())); if let Some(FileReaderResult::ArrayBuffer(ref mut heap)) = *result.borrow_mut() { - heap.set(jsval::ObjectValue(&*array_buffer.get())); + heap.set(jsval::ObjectValue(array_buffer.get())); }; } } diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs index c0842dce4fa..81149f8e193 100644 --- a/components/script/dom/promise.rs +++ b/components/script/dom/promise.rs @@ -51,7 +51,7 @@ impl PromiseHelper for Rc<Promise> { #[allow(unsafe_code)] unsafe fn initialize(&self, cx: *mut JSContext) { let obj = self.reflector().get_jsobject(); - self.permanent_js_root.set(ObjectValue(&**obj)); + self.permanent_js_root.set(ObjectValue(*obj)); assert!(AddRawValueRoot(cx, self.permanent_js_root.get_unsafe(), b"Promise::root\0" as *const _ as *const _)); @@ -278,7 +278,7 @@ fn create_native_handler_function(cx: *mut JSContext, assert!(!obj.is_null()); SetFunctionNativeReserved(obj.get(), SLOT_NATIVEHANDLER, - &ObjectValue(&**holder)); + &ObjectValue(*holder)); SetFunctionNativeReserved(obj.get(), SLOT_NATIVEHANDLER_TASK, &Int32Value(task as i32)); |