diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-10-14 12:47:48 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-10-14 12:47:48 -0600 |
commit | 32daa17d5cbcad02db0713e21e52410cdc60480e (patch) | |
tree | d5cf3137ab06523b1c8958d830751b74642f048e /components/script/dom/element.rs | |
parent | 8db8a86ab1e943b5102a05d6d31800579fdb7875 (diff) | |
parent | aab2c40389c71c4b0db3ffa75bdec99cd440b8af (diff) | |
download | servo-32daa17d5cbcad02db0713e21e52410cdc60480e.tar.gz servo-32daa17d5cbcad02db0713e21e52410cdc60480e.zip |
Auto merge of #7873 - nox:codegen-typeid, r=Ms2ger
Generate the various TypeId enums in codegen
This frees us forever from caring about maintaining these enums. The last commit removes their use from the initialisation of interface objects derived from Node.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7873)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/element.rs')
-rw-r--r-- | components/script/dom/element.rs | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 39633b64fef..5ce83d933de 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -20,13 +20,15 @@ use dom::bindings::codegen::Bindings::HTMLTemplateElementBinding::HTMLTemplateEl use dom::bindings::codegen::Bindings::NamedNodeMapBinding::NamedNodeMapMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::InheritTypes::{CharacterDataCast, DocumentDerived, ElementCast}; -use dom::bindings::codegen::InheritTypes::{ElementDerived, EventTargetCast, HTMLAnchorElementCast}; -use dom::bindings::codegen::InheritTypes::{HTMLBodyElementCast, HTMLFontElementCast}; +use dom::bindings::codegen::InheritTypes::{ElementDerived, ElementTypeId}; +use dom::bindings::codegen::InheritTypes::{EventTargetCast, EventTargetTypeId}; +use dom::bindings::codegen::InheritTypes::{HTMLAnchorElementCast, HTMLBodyElementCast}; +use dom::bindings::codegen::InheritTypes::{HTMLElementTypeId, HTMLFontElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLIFrameElementCast, HTMLInputElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLTableCellElementCast, HTMLTableElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLTableRowElementCast, HTMLTableSectionElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLTemplateElementCast, HTMLTextAreaElementCast}; -use dom::bindings::codegen::InheritTypes::{NodeCast, TextCast}; +use dom::bindings::codegen::InheritTypes::{NodeCast, NodeTypeId, TextCast}; use dom::bindings::codegen::UnionTypes::NodeOrString; use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::js::{JS, LayoutJS, MutNullableHeap}; @@ -39,15 +41,14 @@ use dom::domrect::DOMRect; use dom::domrectlist::DOMRectList; use dom::domtokenlist::DOMTokenList; use dom::event::Event; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; +use dom::eventtarget::EventTarget; use dom::htmlcollection::HTMLCollection; -use dom::htmlelement::HTMLElementTypeId; use dom::htmlinputelement::{HTMLInputElement, RawLayoutHTMLInputElementHelpers}; use dom::htmltablecellelement::HTMLTableCellElementLayoutHelpers; use dom::htmltableelement::HTMLTableElement; use dom::htmltextareaelement::RawLayoutHTMLTextAreaElementHelpers; use dom::namednodemap::NamedNodeMap; -use dom::node::{CLICK_IN_PROGRESS, LayoutNodeHelpers, Node, NodeTypeId, SEQUENTIALLY_FOCUSABLE}; +use dom::node::{CLICK_IN_PROGRESS, LayoutNodeHelpers, Node, SEQUENTIALLY_FOCUSABLE}; use dom::node::{NodeDamage, document_from_node}; use dom::node::{window_from_node}; use dom::nodelist::NodeList; @@ -106,12 +107,6 @@ impl PartialEq for Element { } } -#[derive(Copy, Clone, PartialEq, Debug)] -pub enum ElementTypeId { - HTMLElement(HTMLElementTypeId), - Element, -} - #[derive(PartialEq, HeapSizeOf)] pub enum ElementCreator { ParserCreated, |