1 files changed, 14 insertions, 14 deletions

diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs
index ce33b3648f9..8f9c2bf420e 100644
--- a/components/script/dom/htmlbuttonelement.rs
+++ b/components/script/dom/htmlbuttonelement.rs
@@ -6,14 +6,14 @@ use dom::activation::Activatable;
 use dom::attr::Attr;
 use dom::bindings::codegen::Bindings::HTMLButtonElementBinding;
 use dom::bindings::codegen::Bindings::HTMLButtonElementBinding::HTMLButtonElementMethods;
-use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLButtonElementCast, HTMLElementCast};
-use dom::bindings::codegen::InheritTypes::{HTMLFieldSetElementDerived, NodeCast};
+use dom::bindings::conversions::Castable;
 use dom::bindings::js::Root;
 use dom::document::Document;
 use dom::element::{AttributeMutation, Element, IN_ENABLED_STATE};
 use dom::event::Event;
 use dom::eventtarget::EventTarget;
 use dom::htmlelement::HTMLElement;
+use dom::htmlfieldsetelement::HTMLFieldSetElement;
 use dom::htmlformelement::{FormControl, FormSubmitter};
 use dom::htmlformelement::{SubmittedFrom, HTMLFormElement};
 use dom::node::{Node, document_from_node, window_from_node};
@@ -82,7 +82,7 @@ impl HTMLButtonElementMethods for HTMLButtonElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-button-type
     fn Type(&self) -> DOMString {
-        let elem = ElementCast::from_ref(self);
+        let elem = self.upcast::<Element>();
         let mut ty = elem.get_string_attribute(&atom!("type"));
         ty.make_ascii_lowercase();
         // https://html.spec.whatwg.org/multipage/#attr-button-type
@@ -135,7 +135,7 @@ impl HTMLButtonElementMethods for HTMLButtonElement {
 
 impl VirtualMethods for HTMLButtonElement {
     fn super_type(&self) -> Option<&VirtualMethods> {
-        let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
+        let htmlelement: &HTMLElement = self.upcast::<HTMLElement>();
         Some(htmlelement as &VirtualMethods)
     }
 
@@ -143,7 +143,7 @@ impl VirtualMethods for HTMLButtonElement {
         self.super_type().unwrap().attribute_mutated(attr, mutation);
         match attr.local_name() {
             &atom!(disabled) => {
-                let el = ElementCast::from_ref(self);
+                let el = self.upcast::<Element>();
                 match mutation {
                     AttributeMutation::Set(Some(_)) => {}
                     AttributeMutation::Set(None) => {
@@ -166,7 +166,7 @@ impl VirtualMethods for HTMLButtonElement {
             s.bind_to_tree(tree_in_doc);
         }
 
-        let el = ElementCast::from_ref(self);
+        let el = self.upcast::<Element>();
         el.check_ancestors_disabled_state_for_form_control();
     }
 
@@ -175,9 +175,9 @@ impl VirtualMethods for HTMLButtonElement {
             s.unbind_from_tree(tree_in_doc);
         }
 
-        let node = NodeCast::from_ref(self);
-        let el = ElementCast::from_ref(self);
-        if node.ancestors().any(|ancestor| ancestor.r().is_htmlfieldsetelement()) {
+        let node = self.upcast::<Node>();
+        let el = self.upcast::<Element>();
+        if node.ancestors().any(|ancestor| ancestor.r().is::<HTMLFieldSetElement>()) {
             el.check_ancestors_disabled_state_for_form_control();
         } else {
             el.check_disabled_attribute();
@@ -189,12 +189,12 @@ impl FormControl for HTMLButtonElement {}
 
 impl<'a> Activatable for &'a HTMLButtonElement {
     fn as_element(&self) -> &Element {
-        ElementCast::from_ref(*self)
+        self.upcast::<Element>()
     }
 
     fn is_instance_activatable(&self) -> bool {
         //https://html.spec.whatwg.org/multipage/#the-button-element
-        let el = ElementCast::from_ref(*self);
+        let el = self.upcast::<Element>();
         !(el.get_disabled_state())
     }
 
@@ -226,14 +226,14 @@ impl<'a> Activatable for &'a HTMLButtonElement {
     #[allow(unsafe_code)]
     fn implicit_submission(&self, ctrlKey: bool, shiftKey: bool, altKey: bool, metaKey: bool) {
         let doc = document_from_node(*self);
-        let node = NodeCast::from_ref(doc.r());
+        let node = doc.upcast::<Node>();
         let owner = self.form_owner();
-        let elem = ElementCast::from_ref(*self);
+        let elem = self.upcast::<Element>();
         if owner.is_none() || elem.click_in_progress() {
             return;
         }
         node.query_selector_iter("button[type=submit]".to_owned()).unwrap()
-            .filter_map(HTMLButtonElementCast::to_root)
+            .filter_map(Root::downcast::<HTMLButtonElement>)
             .find(|r| r.r().form_owner() == owner)
             .map(|s| s.r().synthetic_click_activation(ctrlKey, shiftKey, altKey, metaKey));
     }