1 files changed, 10 insertions, 10 deletions

diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs
index fce14f68c3d..6c76adc7c28 100644
--- a/components/script/dom/characterdata.rs
+++ b/components/script/dom/characterdata.rs
@@ -6,8 +6,8 @@
 
 use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods;
-use dom::bindings::codegen::InheritTypes::{ElementCast, NodeCast};
 use dom::bindings::codegen::UnionTypes::NodeOrString;
+use dom::bindings::conversions::Castable;
 use dom::bindings::error::{Error, ErrorResult, Fallible};
 use dom::bindings::js::{LayoutJS, Root};
 use dom::document::Document;
@@ -113,35 +113,35 @@ impl CharacterDataMethods for CharacterData {
 
     // https://dom.spec.whatwg.org/#dom-childnode-before
     fn Before(&self, nodes: Vec<NodeOrString>) -> ErrorResult {
-        NodeCast::from_ref(self).before(nodes)
+        self.upcast::<Node>().before(nodes)
     }
 
     // https://dom.spec.whatwg.org/#dom-childnode-after
     fn After(&self, nodes: Vec<NodeOrString>) -> ErrorResult {
-        NodeCast::from_ref(self).after(nodes)
+        self.upcast::<Node>().after(nodes)
     }
 
     // https://dom.spec.whatwg.org/#dom-childnode-replacewith
     fn ReplaceWith(&self, nodes: Vec<NodeOrString>) -> ErrorResult {
-        NodeCast::from_ref(self).replace_with(nodes)
+        self.upcast::<Node>().replace_with(nodes)
     }
 
     // https://dom.spec.whatwg.org/#dom-childnode-remove
     fn Remove(&self) {
-        let node = NodeCast::from_ref(self);
+        let node = self.upcast::<Node>();
         node.remove_self();
     }
 
     // https://dom.spec.whatwg.org/#dom-nondocumenttypechildnode-previouselementsibling
     fn GetPreviousElementSibling(&self) -> Option<Root<Element>> {
-        NodeCast::from_ref(self).preceding_siblings()
-                                .filter_map(ElementCast::to_root).next()
+        self.upcast::<Node>().preceding_siblings()
+                             .filter_map(Root::downcast::<Element>).next()
     }
 
     // https://dom.spec.whatwg.org/#dom-nondocumenttypechildnode-nextelementsibling
     fn GetNextElementSibling(&self) -> Option<Root<Element>> {
-        NodeCast::from_ref(self).following_siblings()
-                                .filter_map(ElementCast::to_root).next()
+        self.upcast::<Node>().following_siblings()
+                             .filter_map(Root::downcast::<Element>).next()
     }
 }
 
@@ -157,7 +157,7 @@ impl CharacterData {
     }
 
     fn content_changed(&self) {
-        let node = NodeCast::from_ref(self);
+        let node = self.upcast::<Node>();
         let document = node.owner_doc();
         document.r().content_changed(node, NodeDamage::OtherNodeDamage);
     }