1 files changed, 11 insertions, 12 deletions

diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs
index c2ec85e8da6..f1c011325bf 100644
--- a/components/script/dom/htmloptgroupelement.rs
+++ b/components/script/dom/htmloptgroupelement.rs
@@ -5,13 +5,13 @@
 use dom::attr::Attr;
 use dom::bindings::codegen::Bindings::HTMLOptGroupElementBinding;
 use dom::bindings::codegen::Bindings::HTMLOptGroupElementBinding::HTMLOptGroupElementMethods;
-use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast, HTMLOptionElementCast};
-use dom::bindings::codegen::InheritTypes::{HTMLOptionElementDerived, NodeCast};
+use dom::bindings::conversions::Castable;
 use dom::bindings::js::Root;
 use dom::document::Document;
-use dom::element::{AttributeMutation, IN_ENABLED_STATE};
+use dom::element::{AttributeMutation, Element, IN_ENABLED_STATE};
 use dom::htmlelement::HTMLElement;
-use dom::node::{Node};
+use dom::htmloptionelement::HTMLOptionElement;
+use dom::node::Node;
 use dom::virtualmethods::VirtualMethods;
 use util::str::DOMString;
 
@@ -50,7 +50,7 @@ impl HTMLOptGroupElementMethods for HTMLOptGroupElement {
 
 impl VirtualMethods for HTMLOptGroupElement {
     fn super_type(&self) -> Option<&VirtualMethods> {
-        let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self);
+        let htmlelement: &HTMLElement = self.upcast::<HTMLElement>();
         Some(htmlelement as &VirtualMethods)
     }
 
@@ -66,22 +66,21 @@ impl VirtualMethods for HTMLOptGroupElement {
                     },
                     AttributeMutation::Removed => false,
                 };
-                let node = NodeCast::from_ref(self);
-                let el = ElementCast::from_ref(self);
+                let el = self.upcast::<Element>();
                 el.set_disabled_state(disabled_state);
                 el.set_enabled_state(!disabled_state);
-                let options = node.children().filter(|child| {
-                    child.is_htmloptionelement()
-                }).map(|child| Root::from_ref(HTMLOptionElementCast::to_ref(child.r()).unwrap()));
+                let options = el.upcast::<Node>().children().filter(|child| {
+                    child.is::<HTMLOptionElement>()
+                }).map(|child| Root::from_ref(child.downcast::<HTMLOptionElement>().unwrap()));
                 if disabled_state {
                     for option in options {
-                        let el = ElementCast::from_ref(option.r());
+                        let el = option.upcast::<Element>();
                         el.set_disabled_state(true);
                         el.set_enabled_state(false);
                     }
                 } else {
                     for option in options {
-                        let el = ElementCast::from_ref(option.r());
+                        let el = option.upcast::<Element>();
                         el.check_disabled_attribute();
                     }
                 }