auto merge of #4405 : servo/servo/rustup_20141124, r=jdm

1 files changed, 13 insertions, 14 deletions

diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs
index 3ed4a82200c..a2396a847c9 100644
--- a/components/script/dom/htmlfieldsetelement.rs
+++ b/components/script/dom/htmlfieldsetelement.rs
@@ -11,12 +11,11 @@ use dom::bindings::codegen::InheritTypes::{HTMLElementCast, HTMLLegendElementDer
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflectable, Reflector};
 use dom::document::Document;
-use dom::element::{AttributeHandlers, Element, ElementHelpers, HTMLFieldSetElementTypeId, HTMLButtonElementTypeId};
-use dom::element::{HTMLInputElementTypeId, HTMLSelectElementTypeId, HTMLTextAreaElementTypeId};
-use dom::eventtarget::{EventTarget, NodeTargetTypeId};
+use dom::element::{AttributeHandlers, Element, ElementHelpers, ElementTypeId};
+use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::htmlcollection::{HTMLCollection, CollectionFilter};
 use dom::htmlelement::HTMLElement;
-use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId, window_from_node};
+use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId, window_from_node};
 use dom::validitystate::ValidityState;
 use dom::virtualmethods::VirtualMethods;
 
@@ -30,14 +29,14 @@ pub struct HTMLFieldSetElement {
 
 impl HTMLFieldSetElementDerived for EventTarget {
     fn is_htmlfieldsetelement(&self) -> bool {
-        *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLFieldSetElementTypeId))
+        *self.type_id() == EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLFieldSetElement))
     }
 }
 
 impl HTMLFieldSetElement {
     fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: JSRef<Document>) -> HTMLFieldSetElement {
         HTMLFieldSetElement {
-            htmlelement: HTMLElement::new_inherited(HTMLFieldSetElementTypeId, localName, prefix, document)
+            htmlelement: HTMLElement::new_inherited(ElementTypeId::HTMLFieldSetElement, localName, prefix, document)
         }
     }
 
@@ -101,10 +100,10 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLFieldSetElement> {
                 }).collect();
                 for descendant in filtered.iter().flat_map(|child| child.traverse_preorder()) {
                     match descendant.type_id() {
-                        ElementNodeTypeId(HTMLButtonElementTypeId) |
-                        ElementNodeTypeId(HTMLInputElementTypeId) |
-                        ElementNodeTypeId(HTMLSelectElementTypeId) |
-                        ElementNodeTypeId(HTMLTextAreaElementTypeId) => {
+                        NodeTypeId::Element(ElementTypeId::HTMLButtonElement) |
+                        NodeTypeId::Element(ElementTypeId::HTMLInputElement) |
+                        NodeTypeId::Element(ElementTypeId::HTMLSelectElement) |
+                        NodeTypeId::Element(ElementTypeId::HTMLTextAreaElement) => {
                             descendant.set_disabled_state(true);
                             descendant.set_enabled_state(false);
                         },
@@ -133,10 +132,10 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLFieldSetElement> {
                 }).collect();
                 for descendant in filtered.iter().flat_map(|child| child.traverse_preorder()) {
                     match descendant.type_id() {
-                        ElementNodeTypeId(HTMLButtonElementTypeId) |
-                        ElementNodeTypeId(HTMLInputElementTypeId) |
-                        ElementNodeTypeId(HTMLSelectElementTypeId) |
-                        ElementNodeTypeId(HTMLTextAreaElementTypeId) => {
+                        NodeTypeId::Element(ElementTypeId::HTMLButtonElement) |
+                        NodeTypeId::Element(ElementTypeId::HTMLInputElement) |
+                        NodeTypeId::Element(ElementTypeId::HTMLSelectElement) |
+                        NodeTypeId::Element(ElementTypeId::HTMLTextAreaElement) => {
                             descendant.check_disabled_attribute();
                             descendant.check_ancestors_disabled_state_for_form_control();
                         },