diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 14 | ||||
| -rw-r--r-- | src/components/script/dom/bindings/js.rs | 4 | ||||
| -rw-r--r-- | src/components/script/dom/bindings/utils.rs | 4 | ||||
| -rw-r--r-- | src/components/script/dom/node.rs | 2 | ||||
| -rw-r--r-- | src/components/script/layout_interface.rs | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index fb66afa5a42..76b775b35a6 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -1757,7 +1757,7 @@ class CGAbstractMethod(CGThing): assert(False) # Override me! def CreateBindingJSObject(descriptor, parent=None): - create = " let mut raw: JS<%s> = JS::from_raw(&mut *aObject);\n" % descriptor.concreteType + create = " let mut raw: JS<%s> = JS::from_raw(&*aObject);\n" % descriptor.concreteType if descriptor.proxy: assert not descriptor.createGlobal create += """ @@ -2435,7 +2435,7 @@ class CGSpecializedMethod(CGAbstractExternMethod): self.method = method name = method.identifier.name args = [Argument('*mut JSContext', 'cx'), Argument('JSHandleObject', '_obj'), - Argument('*mut %s' % descriptor.concreteType, 'this'), + Argument('*%s' % descriptor.concreteType, 'this'), Argument('libc::c_uint', 'argc'), Argument('*mut JSVal', 'vp')] CGAbstractExternMethod.__init__(self, descriptor, name, 'JSBool', args) @@ -2480,7 +2480,7 @@ class CGSpecializedGetter(CGAbstractExternMethod): name = 'get_' + attr.identifier.name args = [ Argument('*mut JSContext', 'cx'), Argument('JSHandleObject', '_obj'), - Argument('*mut %s' % descriptor.concreteType, 'this'), + Argument('*%s' % descriptor.concreteType, 'this'), Argument('*mut JSVal', 'vp') ] CGAbstractExternMethod.__init__(self, descriptor, name, "JSBool", args) @@ -2536,7 +2536,7 @@ class CGSpecializedSetter(CGAbstractExternMethod): name = 'set_' + attr.identifier.name args = [ Argument('*mut JSContext', 'cx'), Argument('JSHandleObject', '_obj'), - Argument('*mut %s' % descriptor.concreteType, 'this'), + Argument('*%s' % descriptor.concreteType, 'this'), Argument('*mut JSVal', 'argv')] CGAbstractExternMethod.__init__(self, descriptor, name, "JSBool", args) @@ -3448,14 +3448,14 @@ class CGProxyNamedSetter(CGProxySpecialOperation): class CGProxyUnwrap(CGAbstractMethod): def __init__(self, descriptor): args = [Argument('*mut JSObject', 'obj')] - CGAbstractMethod.__init__(self, descriptor, "UnwrapProxy", '*mut ' + descriptor.concreteType, args, alwaysInline=True) + CGAbstractMethod.__init__(self, descriptor, "UnwrapProxy", '*' + descriptor.concreteType, args, alwaysInline=True) def definition_body(self): return """ /*if (xpc::WrapperFactory::IsXrayWrapper(obj)) { obj = js::UnwrapObject(obj); }*/ //MOZ_ASSERT(IsProxy(obj)); - let box_: *mut %s = cast::transmute(GetProxyPrivate(obj).to_private()); + let box_ = GetProxyPrivate(obj).to_private() as *%s; return box_;""" % (self.descriptor.concreteType) class CGDOMJSProxyHandler_getOwnPropertyDescriptor(CGAbstractExternMethod): @@ -3781,7 +3781,7 @@ class CGAbstractClassHook(CGAbstractExternMethod): def definition_body_prologue(self): return """ - let this: *mut %s = unwrap::<%s>(obj); + let this: *%s = unwrap::<%s>(obj); """ % (self.descriptor.concreteType, self.descriptor.concreteType) def definition_body(self): diff --git a/src/components/script/dom/bindings/js.rs b/src/components/script/dom/bindings/js.rs index bbceae0ad6d..c5d39959c8a 100644 --- a/src/components/script/dom/bindings/js.rs +++ b/src/components/script/dom/bindings/js.rs @@ -150,9 +150,9 @@ impl JS<XMLHttpRequest> { impl<T: Reflectable> JS<T> { /// Create a new JS-owned value wrapped from a raw Rust pointer. - pub unsafe fn from_raw(raw: *mut T) -> JS<T> { + pub unsafe fn from_raw(raw: *T) -> JS<T> { JS { - ptr: raw as *T + ptr: raw } } diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index f23013e203a..7dc751bfbdb 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -84,10 +84,10 @@ pub unsafe fn dom_object_slot(obj: *mut JSObject) -> u32 { } } -pub unsafe fn unwrap<T>(obj: *mut JSObject) -> *mut T { +pub unsafe fn unwrap<T>(obj: *mut JSObject) -> *T { let slot = dom_object_slot(obj); let val = JS_GetReservedSlot(obj, slot); - val.to_private() as *mut T + val.to_private() as *T } pub unsafe fn get_dom_class(obj: *mut JSObject) -> Result<DOMClass, ()> { diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 87a5229b2d5..1361a2e1aa4 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -646,7 +646,7 @@ pub fn from_untrusted_node_address(runtime: *mut JSRuntime, candidate: Untrusted if object.is_null() { fail!("Attempted to create a `JS<Node>` from an invalid pointer!") } - let boxed_node: *mut Node = utils::unwrap(object); + let boxed_node: *Node = utils::unwrap(object); Temporary::new(JS::from_raw(boxed_node)) } } diff --git a/src/components/script/layout_interface.rs b/src/components/script/layout_interface.rs index c7f8d4f7a80..4b69efea010 100644 --- a/src/components/script/layout_interface.rs +++ b/src/components/script/layout_interface.rs @@ -70,7 +70,7 @@ pub struct TrustedNodeAddress(pub *c_void); impl<S: Encoder<E>, E> Encodable<S, E> for TrustedNodeAddress { fn encode(&self, s: &mut S) -> Result<(), E> { let TrustedNodeAddress(addr) = *self; - let node = addr as *Node as *mut Node; + let node = addr as *Node; unsafe { JS::from_raw(node).encode(s) } |