Upgrade to rustc ba2f13ef0 2015-02-04

components/script/dom/bindings/error.rs

@@ -20,7 +20,7 @@ use std::ffi::CString;
 use std::ptr;
 
 /// DOM exceptions that can be thrown by a native DOM method.
-#[derive(Show, Clone)]
+#[derive(Debug, Clone)]
 pub enum Error {
     /// IndexSizeError
     IndexSize,

components/script/dom/bindings/str.rs

@@ -152,7 +152,8 @@ impl Hash<SipHasher> for ByteString {
 }
 
 impl FromStr for ByteString {
-    fn from_str(s: &str) -> Option<ByteString> {
-        Some(ByteString::new(s.to_owned().into_bytes()))
+    type Err = ();
+    fn from_str(s: &str) -> Result<ByteString, ()> {
+        Ok(ByteString::new(s.to_owned().into_bytes()))
     }
 }

components/script/dom/bindings/trace.rs

@@ -57,7 +57,7 @@ use std::collections::HashMap;
 use std::collections::hash_state::HashState;
 use std::ffi::CString;
 use std::hash::{Hash, Hasher};
-use std::io::timer::Timer;
+use std::old_io::timer::Timer;
 use std::rc::Rc;
 use std::sync::mpsc::{Receiver, Sender};
 use string_cache::{Atom, Namespace};