From 76b8810a865500f2029d5f55dc1d3d889316121f Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 4 Jan 2015 11:40:28 +0100 Subject: [PATCH] Disambiguate trait object reference syntax. --- components/devtools/actor.rs | 4 +- components/script/dom/element.rs | 6 +-- components/script/dom/virtualmethods.rs | 52 ++++++++++++------------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/components/devtools/actor.rs b/components/devtools/actor.rs index 178b840ebce..47d0c30761d 100644 --- a/components/devtools/actor.rs +++ b/components/devtools/actor.rs @@ -25,7 +25,7 @@ pub trait Actor : Any { fn name(&self) -> String; } -impl<'a> AnyMutRefExt<'a> for &'a mut Actor + 'a { +impl<'a> AnyMutRefExt<'a> for &'a mut (Actor + 'a) { fn downcast_mut(self) -> Option<&'a mut T> { if self.is::() { unsafe { @@ -41,7 +41,7 @@ impl<'a> AnyMutRefExt<'a> for &'a mut Actor + 'a { } } -impl<'a> AnyRefExt<'a> for &'a Actor + 'a { +impl<'a> AnyRefExt<'a> for &'a (Actor + 'a) { fn is(self) -> bool { // This implementation is only needed so long as there's a Rust bug that // prevents downcast_ref from giving realistic return values. diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index e8f7398d545..6530ddd9c40 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -1462,7 +1462,7 @@ impl<'a> style::TElement<'a> for JSRef<'a, Element> { } pub trait ActivationElementHelpers<'a> { - fn as_maybe_activatable(&'a self) -> Option<&'a Activatable + 'a>; + fn as_maybe_activatable(&'a self) -> Option<&'a (Activatable + 'a)>; fn click_in_progress(self) -> bool; fn set_click_in_progress(self, click: bool); fn nearest_activable_element(self) -> Option>; @@ -1470,12 +1470,12 @@ pub trait ActivationElementHelpers<'a> { } impl<'a> ActivationElementHelpers<'a> for JSRef<'a, Element> { - fn as_maybe_activatable(&'a self) -> Option<&'a Activatable + 'a> { + fn as_maybe_activatable(&'a self) -> Option<&'a (Activatable + 'a)> { let node: JSRef = NodeCast::from_ref(*self); match node.type_id() { NodeTypeId::Element(ElementTypeId::HTMLInputElement) => { let element: &'a JSRef<'a, HTMLInputElement> = HTMLInputElementCast::to_borrowed_ref(self).unwrap(); - Some(element as &'a Activatable + 'a) + Some(element as &'a (Activatable + 'a)) }, _ => { None diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs index ff78a7beaa6..29d556097f4 100644 --- a/components/script/dom/virtualmethods.rs +++ b/components/script/dom/virtualmethods.rs @@ -145,112 +145,112 @@ pub trait VirtualMethods { /// method call on the trait object will invoke the corresponding method on the /// concrete type, propagating up the parent hierarchy unless otherwise /// interrupted. -pub fn vtable_for<'a>(node: &'a JSRef<'a, Node>) -> &'a VirtualMethods + 'a { +pub fn vtable_for<'a>(node: &'a JSRef<'a, Node>) -> &'a (VirtualMethods + 'a) { match node.type_id() { NodeTypeId::Element(ElementTypeId::HTMLAnchorElement) => { let element: &'a JSRef<'a, HTMLAnchorElement> = HTMLAnchorElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLAreaElement) => { let element: &'a JSRef<'a, HTMLAreaElement> = HTMLAreaElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLBodyElement) => { let element: &'a JSRef<'a, HTMLBodyElement> = HTMLBodyElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLButtonElement) => { let element: &'a JSRef<'a, HTMLButtonElement> = HTMLButtonElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLCanvasElement) => { let element: &'a JSRef<'a, HTMLCanvasElement> = HTMLCanvasElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLFieldSetElement) => { let element: &'a JSRef<'a, HTMLFieldSetElement> = HTMLFieldSetElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLImageElement) => { let element: &'a JSRef<'a, HTMLImageElement> = HTMLImageElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLIFrameElement) => { let element: &'a JSRef<'a, HTMLIFrameElement> = HTMLIFrameElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLInputElement) => { let element: &'a JSRef<'a, HTMLInputElement> = HTMLInputElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLLinkElement) => { let element: &'a JSRef<'a, HTMLLinkElement> = HTMLLinkElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLObjectElement) => { let element: &'a JSRef<'a, HTMLObjectElement> = HTMLObjectElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLOptGroupElement) => { let element: &'a JSRef<'a, HTMLOptGroupElement> = HTMLOptGroupElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLOptionElement) => { let element: &'a JSRef<'a, HTMLOptionElement> = HTMLOptionElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLScriptElement) => { let element: &'a JSRef<'a, HTMLScriptElement> = HTMLScriptElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLSelectElement) => { let element: &'a JSRef<'a, HTMLSelectElement> = HTMLSelectElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLStyleElement) => { let element: &'a JSRef<'a, HTMLStyleElement> = HTMLStyleElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLTableElement) => { let element: &'a JSRef<'a, HTMLTableElement> = HTMLTableElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLTableDataCellElement) | NodeTypeId::Element(ElementTypeId::HTMLTableHeaderCellElement) => { let element: &'a JSRef<'a, HTMLTableCellElement> = HTMLTableCellElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLTableRowElement) => { let element: &'a JSRef<'a, HTMLTableRowElement> = HTMLTableRowElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLTableSectionElement) => { let element: &'a JSRef<'a, HTMLTableSectionElement> = HTMLTableSectionElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLTextAreaElement) => { let element: &'a JSRef<'a, HTMLTextAreaElement> = HTMLTextAreaElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::HTMLTitleElement) => { let element: &'a JSRef<'a, HTMLTitleElement> = HTMLTitleElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(ElementTypeId::Element) => { let element: &'a JSRef<'a, Element> = ElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } NodeTypeId::Element(_) => { let element: &'a JSRef<'a, HTMLElement> = HTMLElementCast::to_borrowed_ref(node).unwrap(); - element as &'a VirtualMethods + 'a + element as &'a (VirtualMethods + 'a) } _ => { - node as &'a VirtualMethods + 'a + node as &'a (VirtualMethods + 'a) } } }