From 8770ba113eb33cc69d353ebb043406b7bd9d9be8 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 1 Jun 2015 14:12:12 +0200 Subject: [PATCH] Remove some unnecessary type annotations from the result of *Cast::from_ref. --- components/script/devtools.rs | 13 ++-- components/script/dom/activation.rs | 4 +- components/script/dom/attr.rs | 3 +- components/script/dom/characterdata.rs | 2 +- components/script/dom/closeevent.rs | 2 +- components/script/dom/cssstyledeclaration.rs | 22 +++--- components/script/dom/customevent.rs | 2 +- .../script/dom/dedicatedworkerglobalscope.rs | 8 +-- components/script/dom/document.rs | 68 +++++++++---------- components/script/dom/documentfragment.rs | 4 +- components/script/dom/documenttype.rs | 2 +- components/script/dom/domimplementation.rs | 6 +- components/script/dom/element.rs | 58 ++++++++-------- components/script/dom/errorevent.rs | 2 +- components/script/dom/htmlanchorelement.rs | 6 +- components/script/dom/htmlbodyelement.rs | 2 +- components/script/dom/htmlbuttonelement.rs | 16 ++--- components/script/dom/htmlcanvaselement.rs | 6 +- components/script/dom/htmldatalistelement.rs | 2 +- components/script/dom/htmlelement.rs | 20 +++--- components/script/dom/htmlfieldsetelement.rs | 6 +- components/script/dom/htmlformelement.rs | 10 +-- components/script/dom/htmliframeelement.rs | 29 ++++---- components/script/dom/htmlimageelement.rs | 15 ++-- components/script/dom/htmlinputelement.rs | 26 +++---- components/script/dom/htmllinkelement.rs | 8 +-- components/script/dom/htmlobjectelement.rs | 3 +- components/script/dom/htmloptgroupelement.rs | 4 +- components/script/dom/htmloptionelement.rs | 25 ++++--- components/script/dom/htmlscriptelement.rs | 18 ++--- components/script/dom/htmlselectelement.rs | 8 +-- components/script/dom/htmlstyleelement.rs | 8 +-- components/script/dom/htmltableelement.rs | 8 +-- components/script/dom/htmltextareaelement.rs | 16 ++--- components/script/dom/htmltitleelement.rs | 8 +-- components/script/dom/keyboardevent.rs | 4 +- components/script/dom/macros.rs | 44 ++++++------ components/script/dom/messageevent.rs | 4 +- components/script/dom/mouseevent.rs | 4 +- components/script/dom/node.rs | 60 ++++++++-------- components/script/dom/progressevent.rs | 2 +- components/script/dom/storage.rs | 7 +- components/script/dom/storageevent.rs | 2 +- components/script/dom/uievent.rs | 2 +- components/script/dom/websocket.rs | 8 +-- components/script/dom/window.rs | 6 +- components/script/dom/worker.rs | 8 +-- components/script/dom/xmlhttprequest.rs | 8 +-- components/script/parse/html.rs | 19 +++--- components/script/script_task.rs | 13 ++-- 50 files changed, 311 insertions(+), 320 deletions(-) diff --git a/components/script/devtools.rs b/components/script/devtools.rs index f14e19999a54..862f3ec6ee29 100644 --- a/components/script/devtools.rs +++ b/components/script/devtools.rs @@ -6,14 +6,13 @@ use devtools_traits::{CachedConsoleMessage, CachedConsoleMessageTypes, PAGE_ERRO use devtools_traits::{EvaluateJSReply, NodeInfo, Modification, TimelineMarker, TimelineMarkerType}; use dom::bindings::conversions::FromJSValConvertible; use dom::bindings::conversions::StringificationBehavior; -use dom::bindings::js::{JSRef, OptionalRootable, Rootable, Temporary}; +use dom::bindings::js::{OptionalRootable, Rootable, Temporary}; use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast}; use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; use dom::bindings::codegen::Bindings::DOMRectBinding::{DOMRectMethods}; use dom::bindings::codegen::Bindings::ElementBinding::{ElementMethods}; use dom::node::{Node, NodeHelpers}; use dom::window::{WindowHelpers, ScriptHelpers}; -use dom::element::Element; use dom::document::DocumentHelpers; use page::{IterablePage, Page}; use msg::constellation_msg::PipelineId; @@ -52,7 +51,7 @@ pub fn handle_get_root_node(page: &Rc, pipeline: PipelineId, reply: Sender let page = get_page(&*page, pipeline); let document = page.document().root(); - let node: JSRef = NodeCast::from_ref(document.r()); + let node = NodeCast::from_ref(document.r()); reply.send(node.summarize()).unwrap(); } @@ -61,14 +60,14 @@ pub fn handle_get_document_element(page: &Rc, pipeline: PipelineId, reply: let document = page.document().root(); let document_element = document.r().GetDocumentElement().root().unwrap(); - let node: JSRef = NodeCast::from_ref(document_element.r()); + let node = NodeCast::from_ref(document_element.r()); reply.send(node.summarize()).unwrap(); } fn find_node_by_unique_id(page: &Rc, pipeline: PipelineId, node_id: String) -> Temporary { let page = get_page(&*page, pipeline); let document = page.document().root(); - let node: JSRef = NodeCast::from_ref(document.r()); + let node = NodeCast::from_ref(document.r()); for candidate in node.traverse_preorder() { if candidate.root().r().get_unique_id() == node_id { @@ -90,7 +89,7 @@ pub fn handle_get_children(page: &Rc, pipeline: PipelineId, node_id: Strin pub fn handle_get_layout(page: &Rc, pipeline: PipelineId, node_id: String, reply: Sender<(f32, f32)>) { let node = find_node_by_unique_id(&*page, pipeline, node_id).root(); - let elem: JSRef = ElementCast::to_ref(node.r()).expect("should be getting layout of element"); + let elem = ElementCast::to_ref(node.r()).expect("should be getting layout of element"); let rect = elem.GetBoundingClientRect().root(); let width = *rect.r().Width(); let height = *rect.r().Height(); @@ -142,7 +141,7 @@ pub fn handle_modify_attribute(page: &Rc, node_id: String, modifications: Vec) { let node = find_node_by_unique_id(&*page, pipeline, node_id).root(); - let elem: JSRef = ElementCast::to_ref(node.r()).expect("should be getting layout of element"); + let elem = ElementCast::to_ref(node.r()).expect("should be getting layout of element"); for modification in modifications.iter(){ match modification.newValue { diff --git a/components/script/dom/activation.rs b/components/script/dom/activation.rs index dbbe4689e1b4..c26a261ba90e 100644 --- a/components/script/dom/activation.rs +++ b/components/script/dom/activation.rs @@ -47,12 +47,12 @@ pub trait Activatable { // Step 4 // https://html.spec.whatwg.org/multipage/#fire-a-synthetic-mouse-event let win = window_from_node(element.r()).root(); - let target: JSRef = EventTargetCast::from_ref(element.r()); + let target = EventTargetCast::from_ref(element.r()); let mouse = MouseEvent::new(win.r(), "click".to_owned(), EventBubbles::DoesNotBubble, EventCancelable::NotCancelable, Some(win.r()), 1, 0, 0, 0, 0, ctrlKey, shiftKey, altKey, metaKey, 0, None).root(); - let event: JSRef = EventCast::from_ref(mouse.r()); + let event = EventCast::from_ref(mouse.r()); event.fire(target); // Step 5 diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs index 299d7408eafe..8576ccf98aed 100644 --- a/components/script/dom/attr.rs +++ b/components/script/dom/attr.rs @@ -10,7 +10,6 @@ use dom::bindings::js::{JS, JSRef, MutNullableHeap, Temporary}; use dom::bindings::js::{OptionalRootable, Rootable, RootedReference}; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::element::{Element, AttributeHandlers}; -use dom::node::Node; use dom::window::Window; use dom::virtualmethods::vtable_for; @@ -248,7 +247,7 @@ impl<'a> AttrHelpers<'a> for JSRef<'a, Attr> { fn set_value(self, set_type: AttrSettingType, value: AttrValue, owner: JSRef) { assert!(Some(owner) == self.owner().root().r()); - let node: JSRef = NodeCast::from_ref(owner); + let node = NodeCast::from_ref(owner); let namespace_is_null = self.namespace == ns!(""); match set_type { diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs index 017bc79f5a28..cc6b9ff304fc 100644 --- a/components/script/dom/characterdata.rs +++ b/components/script/dom/characterdata.rs @@ -136,7 +136,7 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> { // https://dom.spec.whatwg.org/#dom-childnode-remove fn Remove(self) { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.remove_self(); } diff --git a/components/script/dom/closeevent.rs b/components/script/dom/closeevent.rs index 2d2e7d8e323a..f4601d3f4546 100644 --- a/components/script/dom/closeevent.rs +++ b/components/script/dom/closeevent.rs @@ -44,7 +44,7 @@ impl CloseEvent { let event = box CloseEvent::new_inherited(EventTypeId::CloseEvent, wasClean, code, reason); let ev = reflect_dom_object(event, global, CloseEventBinding::Wrap).root(); - let event: JSRef = EventCast::from_ref(ev.r()); + let event = EventCast::from_ref(ev.r()); event.InitEvent(type_, bubbles == EventBubbles::Bubbles, cancelable == EventCancelable::Cancelable); diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index eb0e473ca41b..675d45ccd2f4 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -9,9 +9,9 @@ use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, JSRef, OptionalRootable, Rootable, Temporary}; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::document::DocumentHelpers; -use dom::element::{Element, ElementHelpers, StylePriority}; +use dom::element::{ElementHelpers, StylePriority}; use dom::htmlelement::HTMLElement; -use dom::node::{window_from_node, document_from_node, NodeDamage, Node}; +use dom::node::{window_from_node, document_from_node, NodeDamage}; use dom::window::{Window, WindowHelpers}; use util::str::DOMString; use string_cache::Atom; @@ -80,13 +80,13 @@ trait PrivateCSSStyleDeclarationHelpers { impl<'a> PrivateCSSStyleDeclarationHelpers for JSRef<'a, CSSStyleDeclaration> { fn get_declaration(self, property: &Atom) -> Option { let owner = self.owner.root(); - let element: JSRef = ElementCast::from_ref(owner.r()); + let element = ElementCast::from_ref(owner.r()); element.get_inline_style_declaration(property).map(|decl| decl.clone()) } fn get_important_declaration(self, property: &Atom) -> Option { let owner = self.owner.root(); - let element: JSRef = ElementCast::from_ref(owner.r()); + let element = ElementCast::from_ref(owner.r()); element.get_important_inline_style_declaration(property).map(|decl| decl.clone()) } } @@ -95,7 +95,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { // http://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-length fn Length(self) -> u32 { let owner = self.owner.root(); - let elem: JSRef = ElementCast::from_ref(owner.r()); + let elem = ElementCast::from_ref(owner.r()); let len = match *elem.style_attribute().borrow() { Some(ref declarations) => declarations.normal.len() + declarations.important.len(), None => 0 @@ -107,7 +107,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { fn Item(self, index: u32) -> DOMString { let index = index as usize; let owner = self.owner.root(); - let elem: JSRef = ElementCast::from_ref(owner.r()); + let elem = ElementCast::from_ref(owner.r()); let style_attribute = elem.style_attribute().borrow(); let result = style_attribute.as_ref().and_then(|declarations| { if index > declarations.normal.len() { @@ -225,7 +225,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { } let owner = self.owner.root(); - let element: JSRef = ElementCast::from_ref(owner.r()); + let element = ElementCast::from_ref(owner.r()); // Step 8 for decl in decl_block.normal.iter() { @@ -239,7 +239,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { } let document = document_from_node(element).root(); - let node: JSRef = NodeCast::from_ref(element); + let node = NodeCast::from_ref(element); document.r().content_changed(node, NodeDamage::NodeStyleDamaged); Ok(()) } @@ -268,7 +268,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { let owner = self.owner.root(); let window = window_from_node(owner.r()).root(); let decl_block = parse_style_attribute(&property, &window.r().get_url()); - let element: JSRef = ElementCast::from_ref(owner.r()); + let element = ElementCast::from_ref(owner.r()); // Step 5 for decl in decl_block.normal.iter() { @@ -282,7 +282,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { } let document = document_from_node(element).root(); - let node: JSRef = NodeCast::from_ref(element); + let node = NodeCast::from_ref(element); document.r().content_changed(node, NodeDamage::NodeStyleDamaged); Ok(()) } @@ -317,7 +317,7 @@ impl<'a> CSSStyleDeclarationMethods for JSRef<'a, CSSStyleDeclaration> { None => { // Step 5 let owner = self.owner.root(); - let elem: JSRef = ElementCast::from_ref(owner.r()); + let elem = ElementCast::from_ref(owner.r()); elem.remove_inline_style_property(property) } } diff --git a/components/script/dom/customevent.rs b/components/script/dom/customevent.rs index 5aa761d68467..5b83a0c1d6af 100644 --- a/components/script/dom/customevent.rs +++ b/components/script/dom/customevent.rs @@ -70,7 +70,7 @@ impl<'a> CustomEventMethods for JSRef<'a, CustomEvent> { can_bubble: bool, cancelable: bool, detail: JSVal) { - let event: JSRef = EventCast::from_ref(self); + let event = EventCast::from_ref(self); if event.dispatching() { return; } diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index d4411a811fac..220dbfea5e4d 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -239,8 +239,8 @@ impl<'a> PrivateDedicatedWorkerGlobalScopeHelpers for JSRef<'a, DedicatedWorkerG fn handle_event(self, msg: ScriptMsg) { match msg { ScriptMsg::DOMMessage(data) => { - let scope: JSRef = WorkerGlobalScopeCast::from_ref(self); - let target: JSRef = EventTargetCast::from_ref(self); + let scope = WorkerGlobalScopeCast::from_ref(self); + let target = EventTargetCast::from_ref(self); let message = data.read(GlobalRef::Worker(scope)); MessageEvent::dispatch_jsval(target, GlobalRef::Worker(scope), message); }, @@ -248,11 +248,11 @@ impl<'a> PrivateDedicatedWorkerGlobalScopeHelpers for JSRef<'a, DedicatedWorkerG runnable.handler() }, ScriptMsg::RefcountCleanup(addr) => { - let scope: JSRef = WorkerGlobalScopeCast::from_ref(self); + let scope = WorkerGlobalScopeCast::from_ref(self); LiveDOMReferences::cleanup(scope.get_cx(), addr); } ScriptMsg::FireTimer(TimerSource::FromWorker, timer_id) => { - let scope: JSRef = WorkerGlobalScopeCast::from_ref(self); + let scope = WorkerGlobalScopeCast::from_ref(self); scope.handle_fire_timer(timer_id); } _ => panic!("Unexpected message"), diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index ad7af5562f91..242f3b375295 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -411,7 +411,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { element: JSRef, id: Atom) { assert!({ - let node: JSRef = NodeCast::from_ref(element); + let node = NodeCast::from_ref(element); node.is_in_doc() }); assert!(!id.is_empty()); @@ -428,9 +428,9 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { Occupied(entry) => { let elements = entry.into_mut(); - let new_node: JSRef = NodeCast::from_ref(element); + let new_node = NodeCast::from_ref(element); let mut head: usize = 0; - let root: JSRef = NodeCast::from_ref(root.r()); + let root = NodeCast::from_ref(root.r()); for node in root.traverse_preorder() { let node = node.root(); if let Some(elem) = ElementCast::to_ref(node.r()) { @@ -458,7 +458,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { fn find_fragment_node(self, fragid: DOMString) -> Option> { self.GetElementById(fragid.clone()).or_else(|| { let check_anchor = |&node: &JSRef| { - let elem: JSRef = ElementCast::from_ref(node); + let elem = ElementCast::from_ref(node); elem.get_attribute(&ns!(""), &atom!("name")).root().map_or(false, |attr| { // FIXME(https://github.com/rust-lang/rust/issues/23338) let attr = attr.r(); @@ -466,7 +466,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { &**value == &*fragid }) }; - let doc_node: JSRef = NodeCast::from_ref(self); + let doc_node = NodeCast::from_ref(self); doc_node.traverse_preorder() .filter_map(HTMLAnchorElementCast::to_temporary) .find(|node| check_anchor(&node.root().r())) @@ -498,7 +498,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { Some(root) => root, None => return vec!(), }; - let root: JSRef = NodeCast::from_ref(root); + let root = NodeCast::from_ref(root); let win = self.window.root(); match win.r().layout().mouse_over(root.to_trusted_node_address(), *point) { Ok(MouseOverResponse(node_address)) => node_address, @@ -514,7 +514,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { let event = Event::new(GlobalRef::Window(window.r()), "readystatechange".to_owned(), EventBubbles::DoesNotBubble, EventCancelable::NotCancelable).root(); - let target: JSRef = EventTargetCast::from_ref(self); + let target = EventTargetCast::from_ref(self); let _ = event.r().fire(target); } @@ -548,14 +548,14 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { //TODO: dispatch blur, focus, focusout, and focusin events if let Some(ref elem) = self.focused.get().root() { - let node: JSRef = NodeCast::from_ref(elem.r()); + let node = NodeCast::from_ref(elem.r()); node.set_focus_state(false); } self.focused.set(self.possibly_focused.get()); if let Some(ref elem) = self.focused.get().root() { - let node: JSRef = NodeCast::from_ref(elem.r()); + let node = NodeCast::from_ref(elem.r()); node.set_focus_state(true); // Update the focus state for all elements in the focus chain. @@ -587,7 +587,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { } fn dirty_all_nodes(self) { - let root: JSRef = NodeCast::from_ref(self); + let root = NodeCast::from_ref(self); for node in root.traverse_preorder() { node.root().r().dirty(NodeDamage::OtherNodeDamage) } @@ -621,7 +621,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { }, }.root(); - let node: JSRef = NodeCast::from_ref(el.r()); + let node = NodeCast::from_ref(el.r()); debug!("{} on {:?}", mouse_event_type_string, node.debug_str()); // Prevent click event if form control element is disabled. if let MouseEventType::Click = mouse_event_type { @@ -647,7 +647,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { false, false, false, false, 0i16, None).root(); - let event: JSRef = EventCast::from_ref(event.r()); + let event = EventCast::from_ref(event.r()); // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#trusted-events event.set_trusted(true); @@ -655,7 +655,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { match mouse_event_type { MouseEventType::Click => el.r().authentic_click_activation(event), _ => { - let target: JSRef = EventTargetCast::from_ref(node); + let target = EventTargetCast::from_ref(node); event.fire(target); }, } @@ -721,8 +721,8 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { 0i16, None).root(); - let event: JSRef = EventCast::from_ref(mouse_event.r()); - let target: JSRef = EventTargetCast::from_ref(top_most_node.r()); + let event = EventCast::from_ref(mouse_event.r()); + let target = EventTargetCast::from_ref(top_most_node.r()); event.fire(target); } @@ -745,7 +745,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> { let focused = self.get_focused_element().root(); let body = self.GetBody().root(); - let target: JSRef = match (&focused, &body) { + let target = match (&focused, &body) { (&Some(ref focused), _) => EventTargetCast::from_ref(focused.r()), (&None, &Some(ref body)) => EventTargetCast::from_ref(body.r()), (&None, &None) => EventTargetCast::from_ref(window.r()), @@ -1069,7 +1069,7 @@ impl Document { GlobalRef::Window(window), DocumentBinding::Wrap).root(); - let node: JSRef = NodeCast::from_ref(document.r()); + let node = NodeCast::from_ref(document.r()); node.set_owner_doc(document.r()); Temporary::from_rooted(document.r()) } @@ -1176,7 +1176,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { // https://dom.spec.whatwg.org/#dom-document-doctype fn GetDoctype(self) -> Option> { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.children() .map(|c| c.root()) .filter_map(|c| DocumentTypeCast::to_ref(c.r()).map(Temporary::from_rooted)) @@ -1185,7 +1185,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { // https://dom.spec.whatwg.org/#dom-document-documentelement fn GetDocumentElement(self) -> Option> { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.child_elements().next() } @@ -1460,7 +1460,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { fn GetHead(self) -> Option> { self.get_html_element().and_then(|root| { let root = root.root(); - let node: JSRef = NodeCast::from_ref(root.r()); + let node = NodeCast::from_ref(root.r()); node.children() .map(|c| c.root()) .filter_map(|c| HTMLHeadElementCast::to_ref(c.r()).map(Temporary::from_rooted)) @@ -1477,7 +1477,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { fn GetBody(self) -> Option> { self.get_html_element().and_then(|root| { let root = root.root(); - let node: JSRef = NodeCast::from_ref(root.r()); + let node = NodeCast::from_ref(root.r()); node.children().map(|c| c.root()).find(|child| { match child.r().type_id() { NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBodyElement)) | @@ -1498,7 +1498,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { None => return Err(HierarchyRequest), }; - let node: JSRef = NodeCast::from_ref(new_body); + let node = NodeCast::from_ref(new_body); match node.type_id() { NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBodyElement)) | NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFrameSetElement)) => {} @@ -1514,9 +1514,9 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { match (self.get_html_element().root(), &old_body) { // Step 3. (Some(ref root), &Some(ref child)) => { - let root: JSRef = NodeCast::from_ref(root.r()); - let child: JSRef = NodeCast::from_ref(child.r()); - let new_body: JSRef = NodeCast::from_ref(new_body); + let root = NodeCast::from_ref(root.r()); + let child = NodeCast::from_ref(child.r()); + let new_body = NodeCast::from_ref(new_body); assert!(root.ReplaceChild(new_body, child).is_ok()) }, @@ -1525,8 +1525,8 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { // Step 5. (Some(ref root), &None) => { - let root: JSRef = NodeCast::from_ref(root.r()); - let new_body: JSRef = NodeCast::from_ref(new_body); + let root = NodeCast::from_ref(root.r()); + let new_body = NodeCast::from_ref(new_body); assert!(root.AppendChild(new_body).is_ok()); } } @@ -1536,7 +1536,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { // https://html.spec.whatwg.org/#dom-document-getelementsbyname fn GetElementsByName(self, name: DOMString) -> Temporary { self.create_node_list(|node| { - let element: JSRef = match ElementCast::to_ref(node) { + let element = match ElementCast::to_ref(node) { Some(element) => element, None => return false, }; @@ -1665,13 +1665,13 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { // https://dom.spec.whatwg.org/#dom-parentnode-queryselector fn QuerySelector(self, selectors: DOMString) -> Fallible>> { - let root: JSRef = NodeCast::from_ref(self); + let root = NodeCast::from_ref(self); root.query_selector(selectors) } // https://dom.spec.whatwg.org/#dom-parentnode-queryselectorall fn QuerySelectorAll(self, selectors: DOMString) -> Fallible> { - let root: JSRef = NodeCast::from_ref(self); + let root = NodeCast::from_ref(self); root.query_selector_all(selectors) } @@ -1839,7 +1839,7 @@ impl DocumentProgressHandler { let event = Event::new(GlobalRef::Window(window.r()), "DOMContentLoaded".to_owned(), EventBubbles::DoesNotBubble, EventCancelable::NotCancelable).root(); - let doctarget: JSRef = EventTargetCast::from_ref(document.r()); + let doctarget = EventTargetCast::from_ref(document.r()); let _ = doctarget.DispatchEvent(event.r()); window.r().reflow(ReflowGoal::ForDisplay, ReflowQueryType::NoQuery, ReflowReason::DOMContentLoaded); @@ -1856,8 +1856,8 @@ impl DocumentProgressHandler { let event = Event::new(GlobalRef::Window(window.r()), "load".to_owned(), EventBubbles::DoesNotBubble, EventCancelable::NotCancelable).root(); - let wintarget: JSRef = EventTargetCast::from_ref(window.r()); - let doctarget: JSRef = EventTargetCast::from_ref(document.r()); + let wintarget = EventTargetCast::from_ref(window.r()); + let doctarget = EventTargetCast::from_ref(document.r()); event.r().set_trusted(true); let _ = wintarget.dispatch_event_with_target(doctarget, event.r()); @@ -1871,7 +1871,7 @@ impl DocumentProgressHandler { let event = Event::new(GlobalRef::Window(frame_window.r()), "load".to_owned(), EventBubbles::DoesNotBubble, EventCancelable::NotCancelable).root(); - let target: JSRef = EventTargetCast::from_ref(frame_element.r()); + let target = EventTargetCast::from_ref(frame_element.r()); event.r().fire(target); }); diff --git a/components/script/dom/documentfragment.rs b/components/script/dom/documentfragment.rs index 15ced7b57ae3..1a15a729ed23 100644 --- a/components/script/dom/documentfragment.rs +++ b/components/script/dom/documentfragment.rs @@ -86,13 +86,13 @@ impl<'a> DocumentFragmentMethods for JSRef<'a, DocumentFragment> { // https://dom.spec.whatwg.org/#dom-parentnode-queryselector fn QuerySelector(self, selectors: DOMString) -> Fallible>> { - let root: JSRef = NodeCast::from_ref(self); + let root = NodeCast::from_ref(self); root.query_selector(selectors) } // https://dom.spec.whatwg.org/#dom-parentnode-queryselectorall fn QuerySelectorAll(self, selectors: DOMString) -> Fallible> { - let root: JSRef = NodeCast::from_ref(self); + let root = NodeCast::from_ref(self); root.query_selector_all(selectors) } } diff --git a/components/script/dom/documenttype.rs b/components/script/dom/documenttype.rs index b5fd4300b702..f059eb3f5477 100644 --- a/components/script/dom/documenttype.rs +++ b/components/script/dom/documenttype.rs @@ -106,7 +106,7 @@ impl<'a> DocumentTypeMethods for JSRef<'a, DocumentType> { // https://dom.spec.whatwg.org/#dom-childnode-remove fn Remove(self) { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.remove_self(); } } diff --git a/components/script/dom/domimplementation.rs b/components/script/dom/domimplementation.rs index 8171db316acf..8b4e94825935 100644 --- a/components/script/dom/domimplementation.rs +++ b/components/script/dom/domimplementation.rs @@ -82,13 +82,13 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { }; { - let doc_node: JSRef = NodeCast::from_ref(doc.r()); + let doc_node = NodeCast::from_ref(doc.r()); // Step 4. match maybe_doctype { None => (), Some(ref doctype) => { - let doc_type: JSRef = NodeCast::from_ref(*doctype); + let doc_type = NodeCast::from_ref(*doctype); assert!(doc_node.AppendChild(doc_type).is_ok()) } } @@ -119,7 +119,7 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { // Step 1-2. let doc = Document::new(win.r(), None, IsHTMLDocument::HTMLDocument, None, None, DocumentSource::NotFromParser, loader).root(); - let doc_node: JSRef = NodeCast::from_ref(doc.r()); + let doc_node = NodeCast::from_ref(doc.r()); { // Step 3. diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index e0d0b79f6401..c7df526fd9db 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -566,7 +566,7 @@ pub trait ElementHelpers<'a> { impl<'a> ElementHelpers<'a> for JSRef<'a, Element> { fn html_element_in_html_document(self) -> bool { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); self.namespace == ns!(HTML) && node.is_in_html_doc() } @@ -700,7 +700,7 @@ impl<'a> ElementHelpers<'a> for JSRef<'a, Element> { } fn serialize(self, traversal_scope: TraversalScope) -> Fallible { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); let mut writer = vec![]; match serialize(&mut writer, &node, SerializeOpts { @@ -714,7 +714,7 @@ impl<'a> ElementHelpers<'a> for JSRef<'a, Element> { // https://html.spec.whatwg.org/multipage/#root-element fn get_root_element(self) -> Temporary { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.inclusive_ancestors() .filter_map(ElementCast::to_temporary) .last() @@ -762,7 +762,7 @@ impl<'a> FocusElementHelpers for JSRef<'a, Element> { return false; } // TODO: Check whether the element is being rendered (i.e. not hidden). - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); if node.get_flag(SEQUENTIALLY_FOCUSABLE) { return true; } @@ -779,7 +779,7 @@ impl<'a> FocusElementHelpers for JSRef<'a, Element> { } fn is_actually_disabled(self) -> bool { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); match node.type_id() { NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLButtonElement)) | NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLInputElement)) | @@ -993,7 +993,7 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> { vtable_for(&NodeCast::from_ref(self)).after_remove_attr(attr.r().name()); } - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); if node.is_in_doc() { let document = document_from_node(self).root(); let damage = if attr.r().local_name() == &atom!("style") { @@ -1009,7 +1009,7 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> { fn has_class(self, name: &Atom) -> bool { let quirks_mode = { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); let owner_doc = node.owner_doc().root(); owner_doc.r().quirks_mode() }; @@ -1189,7 +1189,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> { fn Attributes(self) -> Temporary { self.attr_list.or_init(|| { let doc = { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.owner_doc().root() }; let window = doc.r().window().root(); @@ -1299,7 +1299,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> { // http://dev.w3.org/csswg/cssom-view/#dom-element-getclientrects fn GetClientRects(self) -> Temporary { let win = window_from_node(self).root(); - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); let raw_rects = node.get_content_boxes(); let rects = raw_rects.iter().map(|rect| { DOMRect::new(win.r(), @@ -1312,7 +1312,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> { // http://dev.w3.org/csswg/cssom-view/#dom-element-getboundingclientrect fn GetBoundingClientRect(self) -> Temporary { let win = window_from_node(self).root(); - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); let rect = node.get_bounding_content_box(); DOMRect::new( win.r(), @@ -1330,7 +1330,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> { // https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#widl-Element-innerHTML fn SetInnerHTML(self, value: DOMString) -> Fallible<()> { - let context_node: JSRef = NodeCast::from_ref(self); + let context_node = NodeCast::from_ref(self); // Step 1. let frag = try!(context_node.parse_fragment(value)); // Step 2. @@ -1346,7 +1346,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> { // https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#widl-Element-outerHTML fn SetOuterHTML(self, value: DOMString) -> Fallible<()> { let context_document = document_from_node(self).root(); - let context_node: JSRef = NodeCast::from_ref(self); + let context_node = NodeCast::from_ref(self); // Step 1. let context_parent = match context_node.GetParentNode() { None => { @@ -1423,13 +1423,13 @@ impl<'a> ElementMethods for JSRef<'a, Element> { // https://dom.spec.whatwg.org/#dom-parentnode-queryselector fn QuerySelector(self, selectors: DOMString) -> Fallible>> { - let root: JSRef = NodeCast::from_ref(self); + let root = NodeCast::from_ref(self); root.query_selector(selectors) } // https://dom.spec.whatwg.org/#dom-parentnode-queryselectorall fn QuerySelectorAll(self, selectors: DOMString) -> Fallible> { - let root: JSRef = NodeCast::from_ref(self); + let root = NodeCast::from_ref(self); root.query_selector_all(selectors) } @@ -1450,7 +1450,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> { // https://dom.spec.whatwg.org/#dom-childnode-remove fn Remove(self) { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.remove_self(); } @@ -1459,7 +1459,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> { match parse_author_origin_selector_list_from_str(&selectors) { Err(()) => Err(Syntax), Ok(ref selectors) => { - let root: JSRef = NodeCast::from_ref(self); + let root = NodeCast::from_ref(self); Ok(matches(selectors, &root, &mut None)) } } @@ -1470,7 +1470,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> { match parse_author_origin_selector_list_from_str(&selectors) { Err(()) => Err(Syntax), Ok(ref selectors) => { - let root: JSRef = NodeCast::from_ref(self); + let root = NodeCast::from_ref(self); for element in root.inclusive_ancestors() { let element = element.root(); if let Some(element) = ElementCast::to_ref(element.r()) { @@ -1496,7 +1496,7 @@ impl<'a> VirtualMethods for JSRef<'a, Element> { s.after_set_attr(attr); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); match attr.local_name() { &atom!("style") => { // Modifying the `style` attribute might change style. @@ -1544,7 +1544,7 @@ impl<'a> VirtualMethods for JSRef<'a, Element> { s.before_remove_attr(attr); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); match attr.local_name() { &atom!("style") => { // Modifying the `style` attribute might change style. @@ -1630,7 +1630,7 @@ impl<'a> VirtualMethods for JSRef<'a, Element> { impl<'a> style::node::TElement<'a> for JSRef<'a, Element> { fn is_link(self) -> bool { // FIXME: This is HTML only. - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); match node.type_id() { // https://html.spec.whatwg.org/multipage/#selector-link NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAnchorElement)) | @@ -1671,14 +1671,14 @@ impl<'a> style::node::TElement<'a> for JSRef<'a, Element> { get_namespace(self) } fn get_hover_state(self) -> bool { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.get_hover_state() } fn get_focus_state(self) -> bool { // TODO: Also check whether the top-level browsing context has the system focus, // and whether this element is a browsing context container. // https://html.spec.whatwg.org/multipage/#selector-focus - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.get_focus_state() } fn get_id(self) -> Option { @@ -1694,11 +1694,11 @@ impl<'a> style::node::TElement<'a> for JSRef<'a, Element> { }) } fn get_disabled_state(self) -> bool { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.get_disabled_state() } fn get_enabled_state(self) -> bool { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.get_enabled_state() } fn get_checked_state(self) -> bool { @@ -1759,7 +1759,7 @@ pub trait ActivationElementHelpers<'a> { impl<'a> ActivationElementHelpers<'a> for JSRef<'a, Element> { fn as_maybe_activatable(&'a self) -> Option<&'a (Activatable + 'a)> { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); let element = match node.type_id() { NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLInputElement)) => { let element: &'a JSRef<'a, HTMLInputElement> = HTMLInputElementCast::to_borrowed_ref(self).unwrap(); @@ -1783,12 +1783,12 @@ impl<'a> ActivationElementHelpers<'a> for JSRef<'a, Element> { } fn click_in_progress(self) -> bool { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.get_flag(CLICK_IN_PROGRESS) } fn set_click_in_progress(self, click: bool) { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.set_flag(CLICK_IN_PROGRESS, click) } @@ -1797,7 +1797,7 @@ impl<'a> ActivationElementHelpers<'a> for JSRef<'a, Element> { match self.as_maybe_activatable() { Some(el) => Some(Temporary::from_rooted(el.as_element().root().r())), None => { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); for node in node.ancestors() { let node = node.root(); if let Some(node) = ElementCast::to_ref(node.r()) { @@ -1824,7 +1824,7 @@ impl<'a> ActivationElementHelpers<'a> for JSRef<'a, Element> { // the script can generate more click events from the handler) assert!(!self.click_in_progress()); - let target: JSRef = EventTargetCast::from_ref(self); + let target = EventTargetCast::from_ref(self); // Step 2 (requires canvas support) // Step 3 self.set_click_in_progress(true); diff --git a/components/script/dom/errorevent.rs b/components/script/dom/errorevent.rs index a43dd3685052..63abc00ac277 100644 --- a/components/script/dom/errorevent.rs +++ b/components/script/dom/errorevent.rs @@ -65,7 +65,7 @@ impl ErrorEvent { colno: u32, error: JSVal) -> Temporary { let ev = ErrorEvent::new_uninitialized(global).root(); - let event: JSRef = EventCast::from_ref(ev.r()); + let event = EventCast::from_ref(ev.r()); event.InitEvent(type_, bubbles == EventBubbles::Bubbles, cancelable == EventCancelable::Cancelable); // FIXME(https://github.com/rust-lang/rust/issues/23338) diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index 21aff2de855c..ee51bfc1c8ca 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -89,12 +89,12 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLAnchorElement> { impl<'a> HTMLAnchorElementMethods for JSRef<'a, HTMLAnchorElement> { fn Text(self) -> DOMString { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.GetTextContent().unwrap() } fn SetText(self, value: DOMString) { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.SetTextContent(Some(value)) } @@ -133,7 +133,7 @@ impl<'a> Activatable for JSRef<'a, HTMLAnchorElement> { } //TODO: Step 2. Check if browsing context is specified and act accordingly. //Step 3. Handle . - let element: JSRef = ElementCast::from_ref(*self); + let element = ElementCast::from_ref(*self); let mouse_event = MouseEventCast::to_ref(event).unwrap(); let mut ismap_suffix = None; if let Some(element) = ElementCast::to_ref(target) { diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs index 97cd615f910b..5d5bd3dec72e 100644 --- a/components/script/dom/htmlbodyelement.rs +++ b/components/script/dom/htmlbodyelement.rs @@ -125,7 +125,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLBodyElement> { let (cx, url, reflector) = (window.r().get_cx(), window.r().get_url(), window.r().reflector().get_jsobject()); - let evtarget: JSRef = + let evtarget = if FORWARDED_EVENTS.iter().any(|&event| &**name == event) { EventTargetCast::from_ref(window.r()) } else { diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index 3bb7012cab4c..4116b8d78a47 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -86,7 +86,7 @@ impl<'a> HTMLButtonElementMethods for JSRef<'a, HTMLButtonElement> { // https://html.spec.whatwg.org/multipage/#dom-button-type fn Type(self) -> DOMString { - let elem: JSRef = ElementCast::from_ref(self); + let elem = ElementCast::from_ref(self); let ty = elem.get_string_attribute(&atom!("type")).into_ascii_lowercase(); // https://html.spec.whatwg.org/multipage/#attr-button-type match &*ty { @@ -142,7 +142,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLButtonElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(true); node.set_enabled_state(false); }, @@ -157,7 +157,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLButtonElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(false); node.set_enabled_state(true); node.check_ancestors_disabled_state_for_form_control(); @@ -171,7 +171,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLButtonElement> { s.bind_to_tree(tree_in_doc); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.check_ancestors_disabled_state_for_form_control(); } @@ -180,7 +180,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLButtonElement> { s.unbind_from_tree(tree_in_doc); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); if node.ancestors().any(|ancestor| ancestor.root().r().is_htmlfieldsetelement()) { node.check_ancestors_disabled_state_for_form_control(); } else { @@ -202,7 +202,7 @@ impl<'a> Activatable for JSRef<'a, HTMLButtonElement> { fn is_instance_activatable(&self) -> bool { //https://html.spec.whatwg.org/multipage/#the-button-element - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); !(node.get_disabled_state()) } @@ -234,9 +234,9 @@ impl<'a> Activatable for JSRef<'a, HTMLButtonElement> { #[allow(unsafe_code)] fn implicit_submission(&self, ctrlKey: bool, shiftKey: bool, altKey: bool, metaKey: bool) { let doc = document_from_node(*self).root(); - let node: JSRef = NodeCast::from_ref(doc.r()); + let node = NodeCast::from_ref(doc.r()); let owner = self.form_owner(); - let elem: JSRef = ElementCast::from_ref(*self); + let elem = ElementCast::from_ref(*self); if owner.is_none() || elem.click_in_progress() { return; } diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index 3a4d7c15d18b..96eb6554eb03 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -17,7 +17,7 @@ use dom::bindings::js::Unrooted; use dom::bindings::utils::{Reflectable}; use dom::canvasrenderingcontext2d::{CanvasRenderingContext2D, LayoutCanvasRenderingContext2DHelpers}; use dom::document::Document; -use dom::element::{Element, AttributeHandlers}; +use dom::element::AttributeHandlers; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; @@ -163,7 +163,7 @@ impl<'a> HTMLCanvasElementMethods for JSRef<'a, HTMLCanvasElement> { } fn SetWidth(self, width: u32) { - let elem: JSRef = ElementCast::from_ref(self); + let elem = ElementCast::from_ref(self); elem.set_uint_attribute(&atom!("width"), width) } @@ -172,7 +172,7 @@ impl<'a> HTMLCanvasElementMethods for JSRef<'a, HTMLCanvasElement> { } fn SetHeight(self, height: u32) { - let elem: JSRef = ElementCast::from_ref(self); + let elem = ElementCast::from_ref(self); elem.set_uint_attribute(&atom!("height"), height) } diff --git a/components/script/dom/htmldatalistelement.rs b/components/script/dom/htmldatalistelement.rs index d9bd35279ef9..38cf054820ec 100644 --- a/components/script/dom/htmldatalistelement.rs +++ b/components/script/dom/htmldatalistelement.rs @@ -57,7 +57,7 @@ impl<'a> HTMLDataListElementMethods for JSRef<'a, HTMLDataListElement> { elem.is_htmloptionelement() } } - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); let filter = box HTMLDataListOptionsFilter; let window = window_from_node(node).root(); HTMLCollection::create(window.r(), node, filter) diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index ffa133083755..8b6e9b49eaac 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -80,7 +80,7 @@ trait PrivateHTMLElementHelpers { impl<'a> PrivateHTMLElementHelpers for JSRef<'a, HTMLElement> { fn is_body_or_frameset(self) -> bool { - let eventtarget: JSRef = EventTargetCast::from_ref(self); + let eventtarget = EventTargetCast::from_ref(self); eventtarget.is_htmlbodyelement() || eventtarget.is_htmlframesetelement() } @@ -153,7 +153,7 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { let win = window_from_node(self).root(); win.r().GetOnload() } else { - let target: JSRef = EventTargetCast::from_ref(self); + let target = EventTargetCast::from_ref(self); target.get_event_handler_common("load") } } @@ -163,7 +163,7 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { let win = window_from_node(self).root(); win.r().SetOnload(listener) } else { - let target: JSRef = EventTargetCast::from_ref(self); + let target = EventTargetCast::from_ref(self); target.set_event_handler_common("load", listener) } } @@ -176,7 +176,7 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { return; } } - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); // https://www.w3.org/Bugs/Public/show_bug.cgi?id=27430 ? element.as_maybe_activatable().map(|a| a.synthetic_click_activation(false, false, false, false)); } @@ -185,7 +185,7 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { fn Focus(self) { // TODO: Mark the element as locked for focus and run the focusing steps. // https://html.spec.whatwg.org/multipage/#focusing-steps - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); let document = document_from_node(self).root(); let document = document.r(); document.begin_focus_transaction(); @@ -196,7 +196,7 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { // https://html.spec.whatwg.org/multipage/#dom-blur fn Blur(self) { // TODO: Run the unfocusing steps. - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); if !node.get_focus_state() { return; } @@ -235,12 +235,12 @@ impl<'a> HTMLElementCustomAttributeHelpers for JSRef<'a, HTMLElement> { .nth(1).map_or(false, |ch| ch >= 'a' && ch <= 'z') { return Err(Syntax); } - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); element.set_custom_attribute(to_snake_case(name), value) } fn get_custom_attr(self, local_name: DOMString) -> Option { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); let local_name = Atom::from_slice(&to_snake_case(local_name)); element.get_attribute(&ns!(""), &local_name).map(|attr| { let attr = attr.root(); @@ -252,7 +252,7 @@ impl<'a> HTMLElementCustomAttributeHelpers for JSRef<'a, HTMLElement> { } fn delete_custom_attr(self, local_name: DOMString) { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); let local_name = Atom::from_slice(&to_snake_case(local_name)); element.remove_attribute(&ns!(""), &local_name); } @@ -288,7 +288,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLElement> { let (cx, url, reflector) = (window.r().get_cx(), window.r().get_url(), window.r().reflector().get_jsobject()); - let evtarget: JSRef = EventTargetCast::from_ref(*self); + let evtarget = EventTargetCast::from_ref(*self); evtarget.set_event_handler_uncompiled(cx, url, reflector, &name[2..], (**attr.value()).to_owned()); diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs index ba786f095c76..e5b55a12d685 100644 --- a/components/script/dom/htmlfieldsetelement.rs +++ b/components/script/dom/htmlfieldsetelement.rs @@ -65,7 +65,7 @@ impl<'a> HTMLFieldSetElementMethods for JSRef<'a, HTMLFieldSetElement> { TAG_NAMES.iter().any(|&tag_name| tag_name == &**elem.local_name()) } } - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); let filter = box ElementsFilter; let window = window_from_node(node).root(); HTMLCollection::create(window.r(), node, filter) @@ -96,7 +96,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLFieldSetElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(true); node.set_enabled_state(false); let maybe_legend = node.children() @@ -139,7 +139,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLFieldSetElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(false); node.set_enabled_state(true); let maybe_legend = node.children() diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 254465dc4169..ff114932e481 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -177,7 +177,7 @@ impl<'a> HTMLFormElementHelpers for JSRef<'a, HTMLFormElement> { "submit".to_owned(), EventBubbles::Bubbles, EventCancelable::Cancelable).root(); - let target: JSRef = EventTargetCast::from_ref(self); + let target = EventTargetCast::from_ref(self); event.r().fire(target); if event.r().DefaultPrevented() { return; @@ -262,7 +262,7 @@ impl<'a> HTMLFormElementHelpers for JSRef<'a, HTMLFormElement> { buf } - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); // TODO: This is an incorrect way of getting controls owned // by the form, but good enough until html5ever lands let data_set = node.traverse_preorder().filter_map(|child| { @@ -370,13 +370,13 @@ impl<'a> HTMLFormElementHelpers for JSRef<'a, HTMLFormElement> { "reset".to_owned(), EventBubbles::Bubbles, EventCancelable::Cancelable).root(); - let target: JSRef = EventTargetCast::from_ref(self); + let target = EventTargetCast::from_ref(self); event.r().fire(target); if event.r().DefaultPrevented() { return; } - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); // TODO: This is an incorrect way of getting controls owned // by the form, but good enough until html5ever lands @@ -542,7 +542,7 @@ pub trait FormControl<'a> : Copy + Sized { _ => () } } - let node: JSRef = NodeCast::from_ref(elem); + let node = NodeCast::from_ref(elem); for ancestor in node.ancestors() { let ancestor = ancestor.root(); if let Some(ancestor) = HTMLFormElementCast::to_ref(ancestor.r()) { diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 13ec9d9c5a12..68689f025f08 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -16,10 +16,9 @@ use dom::bindings::global::GlobalRef; use dom::bindings::js::{JSRef, OptionalRootable, Rootable, Temporary}; use dom::customevent::CustomEvent; use dom::document::Document; -use dom::element::{self, AttributeHandlers, Element}; -use dom::event::{Event, EventHelpers}; +use dom::element::{self, AttributeHandlers, ElementTypeId}; +use dom::event::EventHelpers; use dom::eventtarget::{EventTarget, EventTargetTypeId}; -use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeHelpers, NodeTypeId, window_from_node}; use dom::urlhelper::UrlHelper; @@ -88,7 +87,7 @@ impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> { } fn get_url(self) -> Option { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); element.get_attribute(&ns!(""), &atom!("src")).root().and_then(|src| { let url = src.r().value(); if url.is_empty() { @@ -158,8 +157,8 @@ impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> { true, true, event.detail().to_jsval(cx)).root(); - let target: JSRef = EventTargetCast::from_ref(self); - let event: JSRef = EventCast::from_ref(custom_event.r()); + let target = EventTargetCast::from_ref(self); + let event = EventCast::from_ref(custom_event.r()); event.fire(target); } } @@ -227,22 +226,22 @@ impl HTMLIFrameElement { impl<'a> HTMLIFrameElementMethods for JSRef<'a, HTMLIFrameElement> { fn Src(self) -> DOMString { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); element.get_string_attribute(&atom!("src")) } fn SetSrc(self, src: DOMString) { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); element.set_url_attribute(&atom!("src"), src) } fn Sandbox(self) -> DOMString { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); element.get_string_attribute(&atom!("sandbox")) } fn SetSandbox(self, sandbox: DOMString) { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); element.set_tokenlist_attribute(&atom!("sandbox"), sandbox); } @@ -284,7 +283,7 @@ impl<'a> HTMLIFrameElementMethods for JSRef<'a, HTMLIFrameElement> { // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#attr-mozbrowser fn Mozbrowser(self) -> bool { if opts::experimental_enabled() { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); element.has_attribute(&Atom::from_slice("mozbrowser")) } else { false @@ -293,7 +292,7 @@ impl<'a> HTMLIFrameElementMethods for JSRef<'a, HTMLIFrameElement> { fn SetMozbrowser(self, value: bool) -> ErrorResult { if opts::experimental_enabled() { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); element.set_bool_attribute(&Atom::from_slice("mozbrowser"), value); } Ok(()) @@ -302,7 +301,7 @@ impl<'a> HTMLIFrameElementMethods for JSRef<'a, HTMLIFrameElement> { // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/goBack fn GoBack(self) -> Fallible<()> { if self.Mozbrowser() { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); if node.is_in_doc() { let window = window_from_node(self).root(); let window = window.r(); @@ -324,7 +323,7 @@ impl<'a> HTMLIFrameElementMethods for JSRef<'a, HTMLIFrameElement> { // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/goForward fn GoForward(self) -> Fallible<()> { if self.Mozbrowser() { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); if node.is_in_doc() { let window = window_from_node(self).root(); let window = window.r(); @@ -392,7 +391,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLIFrameElement> { self.sandbox.set(Some(modes)); } &atom!("src") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); if node.is_in_doc() { self.process_the_iframe_attributes() } diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index a01664f249df..5e8d4f1b3428 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/components/script/dom/htmlimageelement.rs @@ -13,7 +13,6 @@ use dom::bindings::global::GlobalRef; use dom::bindings::js::{JSRef, LayoutJS, Rootable, Temporary}; use dom::bindings::refcounted::Trusted; use dom::document::{Document, DocumentHelpers}; -use dom::element::Element; use dom::element::AttributeHandlers; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; @@ -100,7 +99,7 @@ impl ImageResponder for Responder { EventBubbles::DoesNotBubble, EventCancelable::NotCancelable).root(); let event = event.r(); - let target: JSRef = EventTargetCast::from_ref(node); + let target = EventTargetCast::from_ref(node); event.fire(target); // Trigger reflow @@ -112,7 +111,7 @@ impl<'a> PrivateHTMLImageElementHelpers for JSRef<'a, HTMLImageElement> { /// Makes the local `image` member match the status of the `src` attribute and starts /// prefetching the image. This method must be called after `src` is changed. fn update_image(self, value: Option<(DOMString, &Url)>) { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); let document = node.owner_doc().root(); let window = document.r().window().root(); let window = window.r(); @@ -190,29 +189,29 @@ impl<'a> HTMLImageElementMethods for JSRef<'a, HTMLImageElement> { make_bool_getter!(IsMap); fn SetIsMap(self, is_map: bool) { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); element.set_string_attribute(&atom!("ismap"), is_map.to_string()) } fn Width(self) -> u32 { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); let rect = node.get_bounding_content_box(); rect.size.width.to_px() as u32 } fn SetWidth(self, width: u32) { - let elem: JSRef = ElementCast::from_ref(self); + let elem = ElementCast::from_ref(self); elem.set_uint_attribute(&atom!("width"), width) } fn Height(self) -> u32 { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); let rect = node.get_bounding_content_box(); rect.size.height.to_px() as u32 } fn SetHeight(self, height: u32) { - let elem: JSRef = ElementCast::from_ref(self); + let elem = ElementCast::from_ref(self); elem.set_uint_attribute(&atom!("height"), height) } diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 1525d8f88e8e..dfa543c1ec89 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -346,7 +346,7 @@ fn broadcast_radio_checked(broadcaster: JSRef, group: Option<& //TODO: if not in document, use root ancestor instead of document let owner = broadcaster.form_owner().root(); let doc = document_from_node(broadcaster).root(); - let doc_node: JSRef = NodeCast::from_ref(doc.r()); + let doc_node = NodeCast::from_ref(doc.r()); // This function is a workaround for lifetime constraint difficulties. fn do_broadcast<'a>(doc_node: JSRef<'a, Node>, broadcaster: JSRef<'a, HTMLInputElement>, @@ -387,7 +387,7 @@ fn in_same_group<'a,'b>(other: JSRef<'a, HTMLInputElement>, impl<'a> HTMLInputElementHelpers for JSRef<'a, HTMLInputElement> { fn force_relayout(self) { let doc = document_from_node(self).root(); - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); doc.r().content_changed(node, NodeDamage::OtherNodeDamage) } @@ -399,7 +399,7 @@ impl<'a> HTMLInputElementHelpers for JSRef<'a, HTMLInputElement> { fn get_radio_group_name(self) -> Option { //TODO: determine form owner - let elem: JSRef = ElementCast::from_ref(self); + let elem = ElementCast::from_ref(self); elem.get_attribute(&ns!(""), &atom!("name")) .root() .map(|name| name.r().Value()) @@ -435,7 +435,7 @@ impl<'a> HTMLInputElementHelpers for JSRef<'a, HTMLInputElement> { fn mutable(self) -> bool { // https://html.spec.whatwg.org/multipage/#the-input-element:concept-fe-mutable // https://html.spec.whatwg.org/multipage/#the-readonly-attribute:concept-fe-mutable - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); !(node.get_disabled_state() || self.ReadOnly()) } @@ -469,7 +469,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLInputElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(true); node.set_enabled_state(false); } @@ -532,7 +532,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLInputElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(false); node.set_enabled_state(true); node.check_ancestors_disabled_state_for_form_control(); @@ -584,7 +584,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLInputElement> { s.bind_to_tree(tree_in_doc); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.check_ancestors_disabled_state_for_form_control(); } @@ -593,7 +593,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLInputElement> { s.unbind_from_tree(tree_in_doc); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); if node.ancestors().any(|ancestor| ancestor.root().r().is_htmlfieldsetelement()) { node.check_ancestors_disabled_state_for_form_control(); } else { @@ -699,7 +699,7 @@ impl<'a> Activatable for JSRef<'a, HTMLInputElement> { //TODO: if not in document, use root ancestor instead of document let owner = self.form_owner().root(); let doc = document_from_node(*self).root(); - let doc_node: JSRef = NodeCast::from_ref(doc.r()); + let doc_node = NodeCast::from_ref(doc.r()); let group = self.get_radio_group_name();; // Safe since we only manipulate the DOM tree after finding an element @@ -809,14 +809,14 @@ impl<'a> Activatable for JSRef<'a, HTMLInputElement> { "input".to_owned(), EventBubbles::Bubbles, EventCancelable::NotCancelable).root(); - let target: JSRef = EventTargetCast::from_ref(*self); + let target = EventTargetCast::from_ref(*self); event.r().fire(target); let event = Event::new(GlobalRef::Window(win.r()), "change".to_owned(), EventBubbles::Bubbles, EventCancelable::NotCancelable).root(); - let target: JSRef = EventTargetCast::from_ref(*self); + let target = EventTargetCast::from_ref(*self); event.r().fire(target); } }, @@ -828,14 +828,14 @@ impl<'a> Activatable for JSRef<'a, HTMLInputElement> { #[allow(unsafe_code)] fn implicit_submission(&self, ctrlKey: bool, shiftKey: bool, altKey: bool, metaKey: bool) { let doc = document_from_node(*self).root(); - let node: JSRef = NodeCast::from_ref(doc.r()); + let node = NodeCast::from_ref(doc.r()); let owner = self.form_owner(); let form = match owner { None => return, Some(ref f) => f.root() }; - let elem: JSRef = ElementCast::from_ref(*self); + let elem = ElementCast::from_ref(*self); if elem.click_in_progress() { return; } diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index c0d38221e2e9..a4a0dc931b24 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -96,12 +96,12 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLLinkElement> { s.after_set_attr(attr); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); if !node.is_in_doc() { return; } - let element: JSRef = ElementCast::from_ref(*self); + let element = ElementCast::from_ref(*self); let rel = get_attr(element, &atom!("rel")); match (rel, attr.local_name()) { @@ -127,7 +127,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLLinkElement> { } if tree_in_doc { - let element: JSRef = ElementCast::from_ref(*self); + let element = ElementCast::from_ref(*self); let rel = get_attr(element, &atom!("rel")); let href = get_attr(element, &atom!("href")); @@ -152,7 +152,7 @@ impl<'a> PrivateHTMLLinkElementHelpers for JSRef<'a, HTMLLinkElement> { let window = window.r(); match UrlParser::new().base_url(&window.get_url()).parse(href) { Ok(url) => { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); let mq_attribute = element.get_attribute(&ns!(""), &atom!("media")).root(); let value = mq_attribute.r().map(|a| a.value()); diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs index bb247aa52c10..bae8de2d4d9b 100644 --- a/components/script/dom/htmlobjectelement.rs +++ b/components/script/dom/htmlobjectelement.rs @@ -12,7 +12,6 @@ use dom::bindings::codegen::InheritTypes::HTMLObjectElementDerived; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast}; use dom::bindings::js::{JSRef, Rootable, Temporary}; use dom::document::Document; -use dom::element::Element; use dom::element::AttributeHandlers; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; @@ -67,7 +66,7 @@ impl<'a> ProcessDataURL for JSRef<'a, HTMLObjectElement> { // Makes the local `data` member match the status of the `data` attribute and starts /// prefetching the image. This method must be called after `data` is changed. fn process_data_url(&self) { - let elem: JSRef = ElementCast::from_ref(*self); + let elem = ElementCast::from_ref(*self); // TODO: support other values match (elem.get_attribute(&ns!(""), &atom!("type")).map(|x| x.root().r().Value()), diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs index 15e70190ba33..b70fd0f6e048 100644 --- a/components/script/dom/htmloptgroupelement.rs +++ b/components/script/dom/htmloptgroupelement.rs @@ -72,7 +72,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLOptGroupElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(true); node.set_enabled_state(false); for child in node.children() { @@ -94,7 +94,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLOptGroupElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(false); node.set_enabled_state(true); for child in node.children() { diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index ec40d819b2cd..4256474b67e8 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -12,9 +12,8 @@ use dom::bindings::codegen::InheritTypes::{HTMLOptionElementDerived}; use dom::bindings::codegen::InheritTypes::{HTMLScriptElementDerived}; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::js::{JSRef, Rootable, Temporary}; -use dom::characterdata::CharacterData; use dom::document::Document; -use dom::element::{AttributeHandlers, Element, ElementHelpers}; +use dom::element::{AttributeHandlers, ElementHelpers}; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; @@ -56,7 +55,7 @@ impl HTMLOptionElement { } fn collect_text(node: &JSRef, value: &mut DOMString) { - let elem: JSRef = ElementCast::to_ref(*node).unwrap(); + let elem = ElementCast::to_ref(*node).unwrap(); let svg_script = *elem.namespace() == ns!(SVG) && elem.local_name() == &atom!("script"); let html_script = node.is_htmlscriptelement(); if svg_script || html_script { @@ -65,7 +64,7 @@ fn collect_text(node: &JSRef, value: &mut DOMString) { for child in node.children() { let child = child.root(); if child.r().is_text() { - let characterdata: JSRef = CharacterDataCast::to_ref(child.r()).unwrap(); + let characterdata = CharacterDataCast::to_ref(child.r()).unwrap(); value.push_str(&characterdata.Data()); } else { collect_text(&child.r(), value); @@ -80,13 +79,13 @@ impl<'a> HTMLOptionElementMethods for JSRef<'a, HTMLOptionElement> { // https://www.whatwg.org/html/#dom-option-disabled fn SetDisabled(self, disabled: bool) { - let elem: JSRef = ElementCast::from_ref(self); + let elem = ElementCast::from_ref(self); elem.set_bool_attribute(&atom!("disabled"), disabled) } // https://www.whatwg.org/html/#dom-option-text fn Text(self) -> DOMString { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); let mut content = String::new(); collect_text(&node, &mut content); let v: Vec<&str> = split_html_space_chars(&content).collect(); @@ -95,13 +94,13 @@ impl<'a> HTMLOptionElementMethods for JSRef<'a, HTMLOptionElement> { // https://www.whatwg.org/html/#dom-option-text fn SetText(self, value: DOMString) { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.SetTextContent(Some(value)) } // https://html.spec.whatwg.org/multipage/#attr-option-value fn Value(self) -> DOMString { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); let attr = &atom!("value"); if element.has_attribute(attr) { element.get_string_attribute(attr) @@ -115,7 +114,7 @@ impl<'a> HTMLOptionElementMethods for JSRef<'a, HTMLOptionElement> { // https://html.spec.whatwg.org/multipage/#attr-option-label fn Label(self) -> DOMString { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); let attr = &atom!("label"); if element.has_attribute(attr) { element.get_string_attribute(attr) @@ -142,7 +141,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLOptionElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(true); node.set_enabled_state(false); }, @@ -157,7 +156,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLOptionElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(false); node.set_enabled_state(true); node.check_parent_disabled_state_for_option(); @@ -171,7 +170,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLOptionElement> { s.bind_to_tree(tree_in_doc); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.check_parent_disabled_state_for_option(); } @@ -180,7 +179,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLOptionElement> { s.unbind_from_tree(tree_in_doc); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); if node.GetParentNode().is_some() { node.check_parent_disabled_state_for_option(); } else { diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 35a5d83ad037..e10380c6aaa3 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -22,7 +22,7 @@ use dom::bindings::js::RootedReference; use dom::bindings::refcounted::Trusted; use dom::bindings::trace::JSTraceable; use dom::document::{Document, DocumentHelpers}; -use dom::element::{Element, AttributeHandlers, ElementCreator}; +use dom::element::{AttributeHandlers, ElementCreator}; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::event::{Event, EventBubbles, EventCancelable, EventHelpers}; use dom::element::ElementTypeId; @@ -217,7 +217,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { self.parser_inserted.set(false); // Step 3. - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); if was_parser_inserted && element.has_attribute(&atom!("async")) { self.non_blocking.set(true); } @@ -227,7 +227,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { return NextParserState::Continue; } // Step 5. - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); if !node.is_in_doc() { return NextParserState::Continue; } @@ -483,7 +483,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { } fn is_javascript(self) -> bool { - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); match element.get_attribute(&ns!(""), &atom!("type")).root().map(|s| s.r().Value()) { Some(ref s) if s.is_empty() => { // type attr exists, but empty means js @@ -540,7 +540,7 @@ impl<'a> PrivateHTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { bubbles, cancelable).root(); let event = event.r(); - let target: JSRef = EventTargetCast::from_ref(self); + let target = EventTargetCast::from_ref(self); event.fire(target) } } @@ -555,7 +555,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLScriptElement> { if let Some(ref s) = self.super_type() { s.after_set_attr(attr); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); if attr.local_name() == &atom!("src") && !self.parser_inserted.get() && node.is_in_doc() { self.prepare(); } @@ -565,7 +565,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLScriptElement> { if let Some(ref s) = self.super_type() { s.child_inserted(child); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); if !self.parser_inserted.get() && node.is_in_doc() { self.prepare(); } @@ -589,7 +589,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLScriptElement> { // https://whatwg.org/html/#already-started if self.already_started.get() { - let copy_elem: JSRef = HTMLScriptElementCast::to_ref(copy).unwrap(); + let copy_elem = HTMLScriptElementCast::to_ref(copy).unwrap(); copy_elem.mark_already_started(); } } @@ -607,7 +607,7 @@ impl<'a> HTMLScriptElementMethods for JSRef<'a, HTMLScriptElement> { // https://www.whatwg.org/html/#dom-script-text fn SetText(self, value: DOMString) { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.SetTextContent(Some(value)) } } diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs index c2537a06d46e..94a3b9db7dbd 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/components/script/dom/htmlselectelement.rs @@ -115,7 +115,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLSelectElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(true); node.set_enabled_state(false); }, @@ -130,7 +130,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLSelectElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(false); node.set_enabled_state(true); node.check_ancestors_disabled_state_for_form_control(); @@ -144,7 +144,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLSelectElement> { s.bind_to_tree(tree_in_doc); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.check_ancestors_disabled_state_for_form_control(); } @@ -153,7 +153,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLSelectElement> { s.unbind_from_tree(tree_in_doc); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); if node.ancestors().any(|ancestor| ancestor.root().r().is_htmlfieldsetelement()) { node.check_ancestors_disabled_state_for_form_control(); } else { diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index 8ab295a24afb..d8bddb986f99 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -9,7 +9,7 @@ use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, HTMLSty use dom::bindings::js::{JSRef, OptionalRootable, Rootable, Temporary, RootedReference}; use dom::document::Document; use dom::eventtarget::{EventTarget, EventTargetTypeId}; -use dom::element::{Element, ElementTypeId, AttributeHandlers}; +use dom::element::{ElementTypeId, AttributeHandlers}; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeHelpers, NodeTypeId, window_from_node}; use dom::virtualmethods::VirtualMethods; @@ -57,8 +57,8 @@ pub trait StyleElementHelpers { impl<'a> StyleElementHelpers for JSRef<'a, HTMLStyleElement> { fn parse_own_css(self) { - let node: JSRef = NodeCast::from_ref(self); - let element: JSRef = ElementCast::from_ref(self); + let node = NodeCast::from_ref(self); + let element = ElementCast::from_ref(self); assert!(node.is_in_doc()); let win = window_from_node(node).root(); @@ -92,7 +92,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLStyleElement> { s.child_inserted(child); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); if node.is_in_doc() { self.parse_own_css(); } diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs index a32c3e7e4525..88ff57863b1c 100644 --- a/components/script/dom/htmltableelement.rs +++ b/components/script/dom/htmltableelement.rs @@ -67,7 +67,7 @@ impl HTMLTableElement { impl<'a> HTMLTableElementMethods for JSRef<'a, HTMLTableElement> { // https://www.whatwg.org/html/#dom-table-caption fn GetCaption(self) -> Option> { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.children() .map(|c| c.root()) .filter_map(|c| { @@ -78,20 +78,20 @@ impl<'a> HTMLTableElementMethods for JSRef<'a, HTMLTableElement> { // https://www.whatwg.org/html/#dom-table-caption fn SetCaption(self, new_caption: Option>) { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); let old_caption = self.GetCaption(); match old_caption { Some(htmlelem) => { let htmlelem_root = htmlelem.root(); - let old_caption_node: JSRef = NodeCast::from_ref(htmlelem_root.r()); + let old_caption_node = NodeCast::from_ref(htmlelem_root.r()); assert!(node.RemoveChild(old_caption_node).is_ok()); } None => () } new_caption.map(|caption| { - let new_caption_node: JSRef = NodeCast::from_ref(caption); + let new_caption_node = NodeCast::from_ref(caption); assert!(node.AppendChild(new_caption_node).is_ok()); }); } diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs index 3fc78914173e..532bb970c75a 100644 --- a/components/script/dom/htmltextareaelement.rs +++ b/components/script/dom/htmltextareaelement.rs @@ -172,13 +172,13 @@ impl<'a> HTMLTextAreaElementMethods for JSRef<'a, HTMLTextAreaElement> { // https://html.spec.whatwg.org/multipage/#dom-textarea-defaultvalue fn DefaultValue(self) -> DOMString { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.GetTextContent().unwrap() } // https://html.spec.whatwg.org/multipage/#dom-textarea-defaultvalue fn SetDefaultValue(self, value: DOMString) { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.SetTextContent(Some(value)); // if the element's dirty value flag is false, then the element's @@ -231,7 +231,7 @@ trait PrivateHTMLTextAreaElementHelpers { impl<'a> PrivateHTMLTextAreaElementHelpers for JSRef<'a, HTMLTextAreaElement> { fn force_relayout(self) { let doc = document_from_node(self).root(); - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); doc.r().content_changed(node, NodeDamage::OtherNodeDamage) } @@ -243,7 +243,7 @@ impl<'a> PrivateHTMLTextAreaElementHelpers for JSRef<'a, HTMLTextAreaElement> { EventBubbles::DoesNotBubble, EventCancelable::NotCancelable).root(); - let target: JSRef = EventTargetCast::from_ref(self); + let target = EventTargetCast::from_ref(self); target.dispatch_event(event.r()); } } @@ -261,7 +261,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLTextAreaElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(true); node.set_enabled_state(false); }, @@ -288,7 +288,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLTextAreaElement> { match attr.local_name() { &atom!("disabled") => { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.set_disabled_state(false); node.set_enabled_state(true); node.check_ancestors_disabled_state_for_form_control(); @@ -308,7 +308,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLTextAreaElement> { s.bind_to_tree(tree_in_doc); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); node.check_ancestors_disabled_state_for_form_control(); } @@ -325,7 +325,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLTextAreaElement> { s.unbind_from_tree(tree_in_doc); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); if node.ancestors().any(|ancestor| ancestor.root().r().is_htmlfieldsetelement()) { node.check_ancestors_disabled_state_for_form_control(); } else { diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/htmltitleelement.rs index 3ce8cd7db2c1..067899cf110a 100644 --- a/components/script/dom/htmltitleelement.rs +++ b/components/script/dom/htmltitleelement.rs @@ -50,7 +50,7 @@ impl HTMLTitleElement { impl<'a> HTMLTitleElementMethods for JSRef<'a, HTMLTitleElement> { // https://www.whatwg.org/html/#dom-title-text fn Text(self) -> DOMString { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); let mut content = String::new(); for child in node.children() { let child = child.root(); @@ -65,7 +65,7 @@ impl<'a> HTMLTitleElementMethods for JSRef<'a, HTMLTitleElement> { // https://www.whatwg.org/html/#dom-title-text fn SetText(self, value: DOMString) { - let node: JSRef = NodeCast::from_ref(self); + let node = NodeCast::from_ref(self); node.SetTextContent(Some(value)) } } @@ -81,7 +81,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLTitleElement> { s.child_inserted(child); } - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); if node.is_in_doc() { let document = node.owner_doc().root(); document.r().title_changed(); @@ -89,7 +89,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLTitleElement> { } fn bind_to_tree(&self, is_in_doc: bool) { - let node: JSRef = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(*self); if is_in_doc { let document = node.owner_doc().root(); document.r().title_changed(); diff --git a/components/script/dom/keyboardevent.rs b/components/script/dom/keyboardevent.rs index d0ac71c814c6..58568769114b 100644 --- a/components/script/dom/keyboardevent.rs +++ b/components/script/dom/keyboardevent.rs @@ -769,12 +769,12 @@ impl<'a> KeyboardEventMethods for JSRef<'a, KeyboardEvent> { _modifiersListArg: DOMString, repeat: bool, _locale: DOMString) { - let event: JSRef = EventCast::from_ref(self); + let event = EventCast::from_ref(self); if event.dispatching() { return; } - let uievent: JSRef = UIEventCast::from_ref(self); + let uievent = UIEventCast::from_ref(self); uievent.InitUIEvent(typeArg, canBubbleArg, cancelableArg, viewArg, 0); *self.key_string.borrow_mut() = keyArg; self.location.set(locationArg); diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs index 97a8e7a74d72..3674db5af217 100644 --- a/components/script/dom/macros.rs +++ b/components/script/dom/macros.rs @@ -6,10 +6,10 @@ macro_rules! make_getter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self) -> DOMString { - use dom::element::{Element, AttributeHandlers}; + use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); element.get_string_attribute(&Atom::from_slice($htmlname)) } ); @@ -22,10 +22,10 @@ macro_rules! make_getter( macro_rules! make_bool_getter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self) -> bool { - use dom::element::{Element, AttributeHandlers}; + use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not runtime. element.has_attribute(&Atom::from_slice($htmlname)) } @@ -39,10 +39,10 @@ macro_rules! make_bool_getter( macro_rules! make_uint_getter( ($attr:ident, $htmlname:expr, $default:expr) => ( fn $attr(self) -> u32 { - use dom::element::{Element, AttributeHandlers}; + use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not runtime. element.get_uint_attribute(&Atom::from_slice($htmlname), $default) } @@ -59,10 +59,10 @@ macro_rules! make_uint_getter( macro_rules! make_url_getter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self) -> DOMString { - use dom::element::{Element, AttributeHandlers}; + use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not runtime. element.get_url_attribute(&Atom::from_slice($htmlname)) } @@ -77,11 +77,11 @@ macro_rules! make_url_getter( macro_rules! make_url_or_base_getter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self) -> DOMString { - use dom::element::{Element, AttributeHandlers}; + use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; use dom::window::WindowHelpers; use string_cache::Atom; - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); let url = element.get_url_attribute(&Atom::from_slice($htmlname)); if url.is_empty() { let window = window_from_node(self).root(); @@ -100,11 +100,11 @@ macro_rules! make_url_or_base_getter( macro_rules! make_enumerated_getter( ( $attr:ident, $htmlname:expr, $default:expr, $(($choices: pat))|+) => ( fn $attr(self) -> DOMString { - use dom::element::{Element, AttributeHandlers}; + use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; use std::borrow::ToOwned; - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); let val = element.get_string_attribute(&Atom::from_slice($htmlname)) .into_ascii_lowercase(); // https://html.spec.whatwg.org/multipage/#attr-fs-method @@ -125,10 +125,10 @@ macro_rules! make_enumerated_getter( macro_rules! make_setter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self, value: DOMString) { - use dom::element::{Element, AttributeHandlers}; + use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not at runtime. element.set_string_attribute(&Atom::from_slice($htmlname), value) } @@ -139,10 +139,10 @@ macro_rules! make_setter( macro_rules! make_bool_setter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self, value: bool) { - use dom::element::{Element, AttributeHandlers}; + use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not at runtime. element.set_bool_attribute(&Atom::from_slice($htmlname), value) } @@ -153,7 +153,7 @@ macro_rules! make_bool_setter( macro_rules! make_uint_setter( ($attr:ident, $htmlname:expr, $default:expr) => ( fn $attr(self, value: u32) { - use dom::element::{Element, AttributeHandlers}; + use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; let value = if value > 2147483647 { @@ -161,7 +161,7 @@ macro_rules! make_uint_setter( } else { value }; - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not at runtime. element.set_uint_attribute(&Atom::from_slice($htmlname), value) } @@ -203,10 +203,10 @@ macro_rules! make_limited_uint_setter( macro_rules! make_atomic_setter( ( $attr:ident, $htmlname:expr ) => ( fn $attr(self, value: DOMString) { - use dom::element::{Element, AttributeHandlers}; + use dom::element::AttributeHandlers; use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; - let element: JSRef = ElementCast::from_ref(self); + let element = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not at runtime. element.set_atomic_attribute(&Atom::from_slice($htmlname), value) } @@ -240,12 +240,12 @@ macro_rules! no_jsmanaged_fields( macro_rules! define_event_handler( ($handler: ident, $event_type: ident, $getter: ident, $setter: ident) => ( fn $getter(self) -> Option<$handler> { - let eventtarget: JSRef = EventTargetCast::from_ref(self); + let eventtarget = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common(stringify!($event_type)) } fn $setter(self, listener: Option<$handler>) { - let eventtarget: JSRef = EventTargetCast::from_ref(self); + let eventtarget = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common(stringify!($event_type), listener) } ) diff --git a/components/script/dom/messageevent.rs b/components/script/dom/messageevent.rs index e74e8c95e59b..49a2cd28aacf 100644 --- a/components/script/dom/messageevent.rs +++ b/components/script/dom/messageevent.rs @@ -63,7 +63,7 @@ impl MessageEvent { data: JSVal, origin: DOMString, lastEventId: DOMString) -> Temporary { let ev = MessageEvent::new_initialized(global, data, origin, lastEventId).root(); - let event: JSRef = EventCast::from_ref(ev.r()); + let event = EventCast::from_ref(ev.r()); event.InitEvent(type_, bubbles, cancelable); Temporary::from_rooted(ev.r()) } @@ -85,7 +85,7 @@ impl MessageEvent { let messageevent = MessageEvent::new( scope, "message".to_owned(), false, false, message, "".to_owned(), "".to_owned()).root(); - let event: JSRef = EventCast::from_ref(messageevent.r()); + let event = EventCast::from_ref(messageevent.r()); event.fire(target); } } diff --git a/components/script/dom/mouseevent.rs b/components/script/dom/mouseevent.rs index 131889952bf8..71dd5a5fbca8 100644 --- a/components/script/dom/mouseevent.rs +++ b/components/script/dom/mouseevent.rs @@ -171,12 +171,12 @@ impl<'a> MouseEventMethods for JSRef<'a, MouseEvent> { metaKeyArg: bool, buttonArg: i16, relatedTargetArg: Option>) { - let event: JSRef = EventCast::from_ref(self); + let event = EventCast::from_ref(self); if event.dispatching() { return; } - let uievent: JSRef = UIEventCast::from_ref(self); + let uievent = UIEventCast::from_ref(self); uievent.InitUIEvent(typeArg, canBubbleArg, cancelableArg, viewArg, detailArg); self.screen_x.set(screenXArg); self.screen_y.set(screenYArg); diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index ddea136c9f36..e887933d0818 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -32,7 +32,7 @@ use dom::bindings::js::Unrooted; use dom::bindings::trace::JSTraceable; use dom::bindings::trace::RootedVec; use dom::bindings::utils::{Reflectable, reflect_dom_object}; -use dom::characterdata::{CharacterData, CharacterDataHelpers, CharacterDataTypeId}; +use dom::characterdata::{CharacterDataHelpers, CharacterDataTypeId}; use dom::comment::Comment; use dom::document::{Document, DocumentHelpers, IsHTMLDocument, DocumentSource}; use dom::documentfragment::DocumentFragment; @@ -1045,7 +1045,7 @@ impl<'a> NodeHelpers for JSRef<'a, Node> { // https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#dfn-concept-parse-fragment fn parse_fragment(self, markup: DOMString) -> Fallible> { - let context_node: JSRef = NodeCast::from_ref(self); + let context_node = NodeCast::from_ref(self); let context_document = document_from_node(self).root(); let mut new_children: RootedVec> = RootedVec::new(); if context_document.r().is_html_document() { @@ -1055,7 +1055,7 @@ impl<'a> NodeHelpers for JSRef<'a, Node> { unimplemented!(); } let fragment = DocumentFragment::new(context_document.r()).root(); - let fragment_node: JSRef = NodeCast::from_ref(fragment.r()); + let fragment_node = NodeCast::from_ref(fragment.r()); for node in new_children.iter() { fragment_node.AppendChild(node.root().r()).unwrap(); } @@ -1813,7 +1813,7 @@ impl Node { // XXXabinader: clone() for each node as trait? let copy: Root = match node.type_id() { NodeTypeId::DocumentType => { - let doctype: JSRef = DocumentTypeCast::to_ref(node).unwrap(); + let doctype = DocumentTypeCast::to_ref(node).unwrap(); let doctype = DocumentType::new(doctype.name().clone(), Some(doctype.public_id().clone()), Some(doctype.system_id().clone()), document.r()); @@ -1829,7 +1829,7 @@ impl Node { NodeCast::from_temporary(comment) }, NodeTypeId::Document => { - let document: JSRef = DocumentCast::to_ref(node).unwrap(); + let document = DocumentCast::to_ref(node).unwrap(); let is_html_doc = match document.is_html_document() { true => IsHTMLDocument::HTMLDocument, false => IsHTMLDocument::NonHTMLDocument, @@ -1842,7 +1842,7 @@ impl Node { NodeCast::from_temporary(document) }, NodeTypeId::Element(..) => { - let element: JSRef = ElementCast::to_ref(node).unwrap(); + let element = ElementCast::to_ref(node).unwrap(); let name = QualName { ns: element.namespace().clone(), local: element.local_name().clone() @@ -1858,7 +1858,7 @@ impl Node { NodeCast::from_temporary(text) }, NodeTypeId::CharacterData(CharacterDataTypeId::ProcessingInstruction) => { - let pi: JSRef = ProcessingInstructionCast::to_ref(node).unwrap(); + let pi = ProcessingInstructionCast::to_ref(node).unwrap(); let pi = ProcessingInstruction::new(pi.Target(), CharacterDataCast::from_ref(pi).Data(), document.r()); NodeCast::from_temporary(pi) @@ -1875,14 +1875,14 @@ impl Node { // Step 4 (some data already copied in step 2). match node.type_id() { NodeTypeId::Document => { - let node_doc: JSRef = DocumentCast::to_ref(node).unwrap(); - let copy_doc: JSRef = DocumentCast::to_ref(copy.r()).unwrap(); + let node_doc = DocumentCast::to_ref(node).unwrap(); + let copy_doc = DocumentCast::to_ref(copy.r()).unwrap(); copy_doc.set_encoding_name(node_doc.encoding_name().clone()); copy_doc.set_quirks_mode(node_doc.quirks_mode()); }, NodeTypeId::Element(..) => { - let node_elem: JSRef = ElementCast::to_ref(node).unwrap(); - let copy_elem: JSRef = ElementCast::to_ref(copy.r()).unwrap(); + let node_elem = ElementCast::to_ref(node).unwrap(); + let copy_elem = ElementCast::to_ref(copy.r()).unwrap(); // FIXME: https://github.com/mozilla/servo/issues/1737 let window = document.window().root(); @@ -1953,18 +1953,18 @@ impl<'a> NodeMethods for JSRef<'a, Node> { fn NodeName(self) -> DOMString { match self.type_id { NodeTypeId::Element(..) => { - let elem: JSRef = ElementCast::to_ref(self).unwrap(); + let elem = ElementCast::to_ref(self).unwrap(); elem.TagName() } NodeTypeId::CharacterData(CharacterDataTypeId::Text) => "#text".to_owned(), NodeTypeId::CharacterData(CharacterDataTypeId::ProcessingInstruction) => { - let processing_instruction: JSRef = + let processing_instruction = ProcessingInstructionCast::to_ref(self).unwrap(); processing_instruction.Target() } NodeTypeId::CharacterData(CharacterDataTypeId::Comment) => "#comment".to_owned(), NodeTypeId::DocumentType => { - let doctype: JSRef = DocumentTypeCast::to_ref(self).unwrap(); + let doctype = DocumentTypeCast::to_ref(self).unwrap(); doctype.name().clone() }, NodeTypeId::DocumentFragment => "#document-fragment".to_owned(), @@ -2037,7 +2037,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { fn GetNodeValue(self) -> Option { match self.type_id { NodeTypeId::CharacterData(..) => { - let chardata: JSRef = CharacterDataCast::to_ref(self).unwrap(); + let chardata = CharacterDataCast::to_ref(self).unwrap(); Some(chardata.Data()) } _ => { @@ -2065,7 +2065,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { Some(content) } NodeTypeId::CharacterData(..) => { - let characterdata: JSRef = CharacterDataCast::to_ref(self).unwrap(); + let characterdata = CharacterDataCast::to_ref(self).unwrap(); Some(characterdata.Data()) } NodeTypeId::DocumentType | @@ -2093,7 +2093,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { Node::replace_all(node.r(), self); } NodeTypeId::CharacterData(..) => { - let characterdata: JSRef = CharacterDataCast::to_ref(self).unwrap(); + let characterdata = CharacterDataCast::to_ref(self).unwrap(); characterdata.SetData(value); // Notify the document that the content of this node is different @@ -2283,14 +2283,14 @@ impl<'a> NodeMethods for JSRef<'a, Node> { let child = child.root(); match TextCast::to_ref(child.r()) { Some(text) => { - let characterdata: JSRef = CharacterDataCast::from_ref(text); + let characterdata = CharacterDataCast::from_ref(text); if characterdata.Length() == 0 { self.remove_child(child.r()); } else { match prev_text { Some(ref text_node) => { let text_node = text_node.clone().root(); - let prev_characterdata: JSRef = + let prev_characterdata = CharacterDataCast::from_ref(text_node.r()); let _ = prev_characterdata.AppendData(characterdata.Data()); self.remove_child(child.r()); @@ -2319,37 +2319,37 @@ impl<'a> NodeMethods for JSRef<'a, Node> { // https://dom.spec.whatwg.org/#dom-node-isequalnode fn IsEqualNode(self, maybe_node: Option>) -> bool { fn is_equal_doctype(node: JSRef, other: JSRef) -> bool { - let doctype: JSRef = DocumentTypeCast::to_ref(node).unwrap(); - let other_doctype: JSRef = DocumentTypeCast::to_ref(other).unwrap(); + let doctype = DocumentTypeCast::to_ref(node).unwrap(); + let other_doctype = DocumentTypeCast::to_ref(other).unwrap(); (*doctype.name() == *other_doctype.name()) && (*doctype.public_id() == *other_doctype.public_id()) && (*doctype.system_id() == *other_doctype.system_id()) } fn is_equal_element(node: JSRef, other: JSRef) -> bool { - let element: JSRef = ElementCast::to_ref(node).unwrap(); - let other_element: JSRef = ElementCast::to_ref(other).unwrap(); + let element = ElementCast::to_ref(node).unwrap(); + let other_element = ElementCast::to_ref(other).unwrap(); // FIXME: namespace prefix (*element.namespace() == *other_element.namespace()) && (*element.local_name() == *other_element.local_name()) && (element.attrs().len() == other_element.attrs().len()) } fn is_equal_processinginstruction(node: JSRef, other: JSRef) -> bool { - let pi: JSRef = ProcessingInstructionCast::to_ref(node).unwrap(); - let other_pi: JSRef = ProcessingInstructionCast::to_ref(other).unwrap(); + let pi = ProcessingInstructionCast::to_ref(node).unwrap(); + let other_pi = ProcessingInstructionCast::to_ref(other).unwrap(); (*pi.target() == *other_pi.target()) && (*CharacterDataCast::from_ref(pi).data() == *CharacterDataCast::from_ref(other_pi).data()) } fn is_equal_characterdata(node: JSRef, other: JSRef) -> bool { - let characterdata: JSRef = CharacterDataCast::to_ref(node).unwrap(); - let other_characterdata: JSRef = CharacterDataCast::to_ref(other).unwrap(); + let characterdata = CharacterDataCast::to_ref(node).unwrap(); + let other_characterdata = CharacterDataCast::to_ref(other).unwrap(); // FIXME(https://github.com/rust-lang/rust/issues/23338) let own_data = characterdata.data(); let other_data = other_characterdata.data(); *own_data == *other_data } fn is_equal_element_attrs(node: JSRef, other: JSRef) -> bool { - let element: JSRef = ElementCast::to_ref(node).unwrap(); - let other_element: JSRef = ElementCast::to_ref(other).unwrap(); + let element = ElementCast::to_ref(node).unwrap(); + let other_element = ElementCast::to_ref(other).unwrap(); assert!(element.attrs().len() == other_element.attrs().len()); // FIXME(https://github.com/rust-lang/rust/issues/23338) let attrs = element.attrs(); @@ -2518,7 +2518,7 @@ pub struct TrustedNodeAddress(pub *const c_void); unsafe impl Send for TrustedNodeAddress {} pub fn document_from_node(derived: JSRef) -> Temporary { - let node: JSRef = NodeCast::from_ref(derived); + let node = NodeCast::from_ref(derived); node.owner_doc() } diff --git a/components/script/dom/progressevent.rs b/components/script/dom/progressevent.rs index 8294fd4b3e5f..8d387fe49d11 100644 --- a/components/script/dom/progressevent.rs +++ b/components/script/dom/progressevent.rs @@ -42,7 +42,7 @@ impl ProgressEvent { let ev = reflect_dom_object(box ProgressEvent::new_inherited(length_computable, loaded, total), global, ProgressEventBinding::Wrap).root(); - let event: JSRef = EventCast::from_ref(ev.r()); + let event = EventCast::from_ref(ev.r()); event.InitEvent(type_, can_bubble, cancelable); Temporary::from_rooted(ev.r()) } diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs index 0afad8294ae5..28b7dac82033 100644 --- a/components/script/dom/storage.rs +++ b/components/script/dom/storage.rs @@ -9,8 +9,7 @@ use dom::bindings::js::{JSRef, Temporary, Rootable, RootedReference}; use dom::bindings::refcounted::Trusted; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::bindings::codegen::InheritTypes::{EventCast, EventTargetCast}; -use dom::event::{Event, EventHelpers, EventBubbles, EventCancelable}; -use dom::eventtarget::{EventTarget}; +use dom::event::{EventHelpers, EventBubbles, EventCancelable}; use dom::storageevent::StorageEvent; use dom::urlhelper::UrlHelper; use dom::window::WindowHelpers; @@ -182,7 +181,7 @@ impl MainThreadRunnable for StorageEventRunnable { ev_url.to_string(), Some(storage) ).root(); - let event: JSRef = EventCast::from_ref(storage_event.r()); + let event = EventCast::from_ref(storage_event.r()); let root_page = script_task.root_page(); for it_page in root_page.iter() { @@ -192,7 +191,7 @@ impl MainThreadRunnable for StorageEventRunnable { // TODO: Such a Document object is not necessarily fully active, but events fired on such // objects are ignored by the event loop until the Document becomes fully active again. if ev_window.pipeline() != it_window.pipeline() { - let target: JSRef = EventTargetCast::from_ref(it_window); + let target = EventTargetCast::from_ref(it_window); event.fire(target); } } diff --git a/components/script/dom/storageevent.rs b/components/script/dom/storageevent.rs index e6de4b0575ae..971abd75c0b8 100644 --- a/components/script/dom/storageevent.rs +++ b/components/script/dom/storageevent.rs @@ -59,7 +59,7 @@ impl StorageEvent { url, storageArea), global, StorageEventBinding::Wrap).root(); - let event: JSRef = EventCast::from_ref(ev.r()); + let event = EventCast::from_ref(ev.r()); event.InitEvent(type_, bubbles == EventBubbles::Bubbles, cancelable == EventCancelable::Cancelable); Temporary::from_rooted(ev.r()) } diff --git a/components/script/dom/uievent.rs b/components/script/dom/uievent.rs index 9c62346ff4a9..07d6eaef5b52 100644 --- a/components/script/dom/uievent.rs +++ b/components/script/dom/uievent.rs @@ -93,7 +93,7 @@ impl<'a> UIEventMethods for JSRef<'a, UIEvent> { cancelable: bool, view: Option>, detail: i32) { - let event: JSRef = EventCast::from_ref(self); + let event = EventCast::from_ref(self); if event.dispatching() { return; } diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index c0c6a6248623..380da76b03af 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -299,7 +299,7 @@ impl WebSocketTaskHandler { "open".to_owned(), EventBubbles::DoesNotBubble, EventCancelable::NotCancelable).root(); - let target: JSRef = EventTargetCast::from_ref(ws); + let target = EventTargetCast::from_ref(ws); event.r().fire(target); } @@ -318,7 +318,7 @@ impl WebSocketTaskHandler { "error".to_owned(), EventBubbles::DoesNotBubble, EventCancelable::Cancelable).root(); - let target: JSRef = EventTargetCast::from_ref(ws); + let target = EventTargetCast::from_ref(ws); event.r().fire(target); } let rsn = ws.reason.borrow(); @@ -333,8 +333,8 @@ impl WebSocketTaskHandler { ws.clean_close.get(), ws.code.get(), rsn_clone).root(); - let target: JSRef = EventTargetCast::from_ref(ws); - let event: JSRef = EventCast::from_ref(close_event.r()); + let target = EventTargetCast::from_ref(ws); + let event = EventCast::from_ref(close_event.r()); event.fire(target); } } diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 21e9bbc28f24..96a0010f8f31 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -24,7 +24,7 @@ use dom::element::Element; use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId}; use dom::location::Location; use dom::navigator::Navigator; -use dom::node::{window_from_node, Node, TrustedNodeAddress, NodeHelpers}; +use dom::node::{window_from_node, TrustedNodeAddress, NodeHelpers}; use dom::performance::Performance; use dom::screen::Screen; use dom::storage::Storage; @@ -626,7 +626,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> { Some(root) => root, None => return, }; - let root: JSRef = NodeCast::from_ref(root); + let root = NodeCast::from_ref(root); let window_size = match self.window_size.get() { Some(window_size) => window_size, @@ -698,7 +698,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> { None => return, }; - let root: JSRef = NodeCast::from_ref(root); + let root = NodeCast::from_ref(root); if query_type == ReflowQueryType::NoQuery && !root.get_has_dirty_descendants() { debug!("root has no dirty descendants; avoiding reflow (reason {:?})", reason); return diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 774cf67e9138..007faa005bdf 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -100,7 +100,7 @@ impl Worker { let worker = address.to_temporary().root(); let global = worker.r().global.root(); - let target: JSRef = EventTargetCast::from_ref(worker.r()); + let target = EventTargetCast::from_ref(worker.r()); let message = data.read(global.r()); MessageEvent::dispatch_jsval(target, global.r(), message); @@ -109,7 +109,7 @@ impl Worker { pub fn dispatch_simple_error(address: TrustedWorkerAddress) { let worker = address.to_temporary().root(); let global = worker.r().global.root(); - let target: JSRef = EventTargetCast::from_ref(worker.r()); + let target = EventTargetCast::from_ref(worker.r()); let event = Event::new(global.r(), "error".to_owned(), @@ -123,11 +123,11 @@ impl Worker { let worker = address.to_temporary().root(); let global = worker.r().global.root(); let error = UndefinedValue(); - let target: JSRef = EventTargetCast::from_ref(worker.r()); + let target = EventTargetCast::from_ref(worker.r()); let errorevent = ErrorEvent::new(global.r(), "error".to_owned(), EventBubbles::Bubbles, EventCancelable::Cancelable, message, filename, lineno, colno, error).root(); - let event: JSRef = EventCast::from_ref(errorevent.r()); + let event = EventCast::from_ref(errorevent.r()); event.fire(target); } } diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 5044feae3b75..5e11123ebdcd 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -492,7 +492,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { if !self.sync.get() { // Step 8 let upload_target = self.upload.root(); - let event_target: JSRef = EventTargetCast::from_ref(upload_target.r()); + let event_target = EventTargetCast::from_ref(upload_target.r()); if event_target.has_handlers() { self.upload_events.set(true); } @@ -760,7 +760,7 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> { "readystatechange".to_owned(), EventBubbles::DoesNotBubble, EventCancelable::Cancelable).root(); - let target: JSRef = EventTargetCast::from_ref(self); + let target = EventTargetCast::from_ref(self); event.r().fire(target); } @@ -945,12 +945,12 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> { type_, false, false, total.is_some(), loaded, total.unwrap_or(0)).root(); - let target: JSRef = if upload { + let target = if upload { EventTargetCast::from_ref(upload_target.r()) } else { EventTargetCast::from_ref(self) }; - let event: JSRef = EventCast::from_ref(progressevent.r()); + let event = EventCast::from_ref(progressevent.r()); event.fire(target); } diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs index a9e125f7da96..6f5c43b7e714 100644 --- a/components/script/parse/html.rs +++ b/components/script/parse/html.rs @@ -25,7 +25,6 @@ use dom::htmlscriptelement::HTMLScriptElement; use dom::htmlscriptelement::HTMLScriptElementHelpers; use dom::node::{Node, NodeHelpers, NodeTypeId}; use dom::node::{document_from_node, window_from_node}; -use dom::processinginstruction::ProcessingInstruction; use dom::processinginstruction::ProcessingInstructionHelpers; use dom::servohtmlparser; use dom::servohtmlparser::{ServoHTMLParser, FragmentContext}; @@ -67,7 +66,7 @@ impl<'a> TreeSink for servohtmlparser::Sink { type Handle = JS; fn get_document(&mut self) -> JS { let doc = self.document.root(); - let node: JSRef = NodeCast::from_ref(doc.r()); + let node = NodeCast::from_ref(doc.r()); JS::from_rooted(node) } @@ -77,7 +76,7 @@ impl<'a> TreeSink for servohtmlparser::Sink { fn elem_name(&self, target: JS) -> QualName { let node: Root = target.root(); - let elem: JSRef = ElementCast::to_ref(node.r()) + let elem = ElementCast::to_ref(node.r()) .expect("tried to get name of non-Element in HTML parsing"); QualName { ns: elem.namespace().clone(), @@ -95,7 +94,7 @@ impl<'a> TreeSink for servohtmlparser::Sink { elem.r().set_attribute_from_parser(attr.name, attr.value, None); } - let node: JSRef = NodeCast::from_ref(elem.r()); + let node = NodeCast::from_ref(elem.r()); JS::from_rooted(node) } @@ -140,7 +139,7 @@ impl<'a> TreeSink for servohtmlparser::Sink { fn append_doctype_to_document(&mut self, name: String, public_id: String, system_id: String) { let doc = self.document.root(); - let doc_node: JSRef = NodeCast::from_ref(doc.r()); + let doc_node = NodeCast::from_ref(doc.r()); let doctype = DocumentType::new(name, Some(public_id), Some(system_id), doc.r()); let node: Root = NodeCast::from_temporary(doctype).root(); @@ -149,7 +148,7 @@ impl<'a> TreeSink for servohtmlparser::Sink { fn add_attrs_if_missing(&mut self, target: JS, attrs: Vec) { let node: Root = target.root(); - let elem: JSRef = ElementCast::to_ref(node.r()) + let elem = ElementCast::to_ref(node.r()) .expect("tried to set attrs on non-Element in HTML parsing"); for attr in attrs.into_iter() { elem.set_attribute_from_parser(attr.name, attr.value, None); @@ -196,7 +195,7 @@ impl<'a> Serializable for JSRef<'a, Node> { let node = *self; match (traversal_scope, node.type_id()) { (_, NodeTypeId::Element(..)) => { - let elem: JSRef = ElementCast::to_ref(node).unwrap(); + let elem = ElementCast::to_ref(node).unwrap(); let name = QualName::new(elem.namespace().clone(), elem.local_name().clone()); if traversal_scope == IncludeNode { @@ -236,7 +235,7 @@ impl<'a> Serializable for JSRef<'a, Node> { (ChildrenOnly, _) => Ok(()), (IncludeNode, NodeTypeId::DocumentType) => { - let doctype: JSRef = DocumentTypeCast::to_ref(node).unwrap(); + let doctype = DocumentTypeCast::to_ref(node).unwrap(); serializer.write_doctype(&doctype.name()) }, @@ -251,7 +250,7 @@ impl<'a> Serializable for JSRef<'a, Node> { }, (IncludeNode, NodeTypeId::CharacterData(CharacterDataTypeId::ProcessingInstruction)) => { - let pi: JSRef = ProcessingInstructionCast::to_ref(node).unwrap(); + let pi = ProcessingInstructionCast::to_ref(node).unwrap(); let data = CharacterDataCast::from_ref(pi).data(); serializer.write_processing_instruction(&pi.target(), &data) }, @@ -313,7 +312,7 @@ pub fn parse_html_fragment(context_node: JSRef, // Step 14. let root_element = document.r().GetDocumentElement().expect("no document element").root(); - let root_node: JSRef = NodeCast::from_ref(root_element.r()); + let root_node = NodeCast::from_ref(root_element.r()); for child in root_node.children() { output.push(JS::from_rooted(child)); } diff --git a/components/script/script_task.rs b/components/script/script_task.rs index cad737b4af45..dd0397fd4789 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -35,10 +35,9 @@ use dom::bindings::utils::{wrap_for_same_compartment, pre_wrap}; use dom::document::{Document, IsHTMLDocument, DocumentHelpers, DocumentProgressHandler, DocumentProgressTask, DocumentSource, MouseEventType}; use dom::element::{Element, AttributeHandlers}; -use dom::event::{Event, EventHelpers, EventBubbles, EventCancelable}; +use dom::event::{EventHelpers, EventBubbles, EventCancelable}; use dom::htmliframeelement::{HTMLIFrameElement, HTMLIFrameElementHelpers}; use dom::uievent::UIEvent; -use dom::eventtarget::EventTarget; use dom::node::{Node, NodeHelpers, NodeDamage, window_from_node}; use dom::servohtmlparser::{ServoHTMLParser, ParserContext}; use dom::window::{Window, WindowHelpers, ScriptHelpers, ReflowReason}; @@ -1006,7 +1005,7 @@ impl ScriptTask { let frame_element = self.find_iframe(doc.r(), subpage_id).root(); if let Some(ref frame_element) = frame_element { - let element: JSRef = ElementCast::from_ref(frame_element.r()); + let element = ElementCast::from_ref(frame_element.r()); doc.r().begin_focus_transaction(); doc.r().request_focus(element); doc.r().commit_focus_transaction(FocusType::Parent); @@ -1336,7 +1335,7 @@ impl ScriptTask { } fn scroll_fragment_point(&self, pipeline_id: PipelineId, node: JSRef) { - let node: JSRef = NodeCast::from_ref(node); + let node = NodeCast::from_ref(node); let rect = node.get_bounding_content_box(); let point = Point2D(rect.origin.x.to_f32_px(), rect.origin.y.to_f32_px()); // FIXME(#2003, pcwalton): This is pretty bogus when multiple layers are involved. @@ -1357,7 +1356,7 @@ impl ScriptTask { /// Find an iframe element in a provided document. fn find_iframe(&self, doc: JSRef, subpage_id: SubpageId) -> Option> { - let doc: JSRef = NodeCast::from_ref(doc); + let doc = NodeCast::from_ref(doc); doc.traverse_preorder() .filter_map(HTMLIFrameElementCast::to_temporary) @@ -1492,9 +1491,9 @@ impl ScriptTask { "resize".to_owned(), EventBubbles::DoesNotBubble, EventCancelable::NotCancelable, Some(window.r()), 0i32).root(); - let event: JSRef = EventCast::from_ref(uievent.r()); + let event = EventCast::from_ref(uievent.r()); - let wintarget: JSRef = EventTargetCast::from_ref(window.r()); + let wintarget = EventTargetCast::from_ref(window.r()); event.fire(wintarget); }