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/characterdata.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/characterdata.rs')
-rw-r--r-- | components/script/dom/characterdata.rs | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs index 01d6efac1e5..dbb2356d8a0 100644 --- a/components/script/dom/characterdata.rs +++ b/components/script/dom/characterdata.rs @@ -6,15 +6,16 @@ use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods; -use dom::bindings::codegen::InheritTypes::NodeCast; -use dom::bindings::codegen::InheritTypes::{CharacterDataDerived, ElementCast}; +use dom::bindings::codegen::InheritTypes::{CharacterDataDerived, CharacterDataTypeId}; +use dom::bindings::codegen::InheritTypes::{ElementCast, EventTargetTypeId}; +use dom::bindings::codegen::InheritTypes::{NodeCast, NodeTypeId}; use dom::bindings::codegen::UnionTypes::NodeOrString; use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::js::{LayoutJS, Root}; use dom::document::Document; use dom::element::Element; -use dom::eventtarget::{EventTarget, EventTargetTypeId}; -use dom::node::{Node, NodeDamage, NodeTypeId}; +use dom::eventtarget::EventTarget; +use dom::node::{Node, NodeDamage}; use std::borrow::ToOwned; use std::cell::Ref; use util::str::DOMString; @@ -156,15 +157,6 @@ impl CharacterDataMethods for CharacterData { } } -/// The different types of CharacterData. -#[derive(Copy, Clone, PartialEq, Debug)] -pub enum CharacterDataTypeId { - Comment, - Text, - ProcessingInstruction, -} - - impl CharacterData { #[inline] pub fn data(&self) -> Ref<DOMString> { |