Update rustc to revision 3dcd2157403163789aaf21a9ab3c4d30a7c6494d.

1 files changed, 7 insertions, 6 deletions

diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs
index f1331ceacd4..91bb1de46c2 100644
--- a/components/script/dom/characterdata.rs
+++ b/components/script/dom/characterdata.rs
@@ -7,12 +7,13 @@
 use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods;
 use dom::bindings::codegen::InheritTypes::{CharacterDataDerived, NodeCast};
-use dom::bindings::error::{Fallible, ErrorResult, IndexSize};
+use dom::bindings::error::{Fallible, ErrorResult};
+use dom::bindings::error::Error::IndexSize;
 use dom::bindings::js::JSRef;
 use dom::bindings::utils::{Reflectable, Reflector};
 use dom::document::Document;
-use dom::eventtarget::{EventTarget, NodeTargetTypeId};
-use dom::node::{CommentNodeTypeId, Node, NodeTypeId, TextNodeTypeId, ProcessingInstructionNodeTypeId, NodeHelpers};
+use dom::eventtarget::{EventTarget, EventTargetTypeId};
+use dom::node::{Node, NodeHelpers, NodeTypeId};
 
 use servo_util::str::DOMString;
 
@@ -27,9 +28,9 @@ pub struct CharacterData {
 impl CharacterDataDerived for EventTarget {
     fn is_characterdata(&self) -> bool {
         match *self.type_id() {
-            NodeTargetTypeId(TextNodeTypeId) |
-            NodeTargetTypeId(CommentNodeTypeId) |
-            NodeTargetTypeId(ProcessingInstructionNodeTypeId) => true,
+            EventTargetTypeId::Node(NodeTypeId::Text) |
+            EventTargetTypeId::Node(NodeTypeId::Comment) |
+            EventTargetTypeId::Node(NodeTypeId::ProcessingInstruction) => true,
             _ => false
         }
     }