Upgrade to rustc a4553453a 2014-07-25.

src/punycode.rs

@@ -15,7 +15,7 @@
 
 use std::u32;
 use std::char;
-use std::str;
+use std::string;
 
 // Bootstring parameters for Punycode
 static BASE: u32 = 36;
@@ -144,7 +144,7 @@ pub fn encode(input: &[char]) -> Option<String> {
     let output_bytes = input.iter().filter_map(|&c|
         if c.is_ascii() { Some(c as u8) } else { None }
     ).collect();
-    let mut output = unsafe { str::raw::from_utf8_owned(output_bytes) };
+    let mut output = unsafe { string::raw::from_utf8(output_bytes) };
     let basic_length = output.len() as u32;
     if basic_length > 0 {
         output.push_str("-")

src/tests.rs

@@ -118,15 +118,15 @@ fn parse_test_data(input: &str) -> Vec<Test> {
         let mut pieces = line.split(' ').collect::<Vec<&str>>();
         let expected_failure = pieces[0] == "XFAIL";
         if expected_failure {
-            pieces.shift();
+            pieces.remove(0);
         }
-        let input = unescape(pieces.shift().unwrap());
+        let input = unescape(pieces.remove(0).unwrap());
         let mut test = Test {
             input: input,
             base: if pieces.is_empty() || pieces[0] == "" {
                 tests.last().unwrap().base.clone()
             } else {
-                unescape(pieces.shift().unwrap())
+                unescape(pieces.remove(0).unwrap())
             },
             scheme: None,
             username: String::new(),