Upgrade to rustc 459ffc2adc74f5e8b64a76f5670edb419b9f65da 2014-07-17

Cargo.toml

@@ -6,7 +6,8 @@ authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]
 
 [[lib]]
 
-name = "url"
+name = "url_"
+path = "src/url.rs"
 
 [dependencies.encoding]
 

src/punycode.rs

@@ -196,14 +196,13 @@ fn value_to_digit(value: u32, output: &mut String) {
 #[cfg(test)]
 mod tests {
     use super::{decode, encode_str};
-    use std::str::from_chars;
     use serialize::json::{from_str, List, Object, String};
 
     fn one_test(description: &str, decoded: &str, encoded: &str) {
         match decode(encoded) {
             None => fail!("Decoding {} failed.", encoded),
             Some(result) => {
-                let result = from_chars(result.as_slice());
+                let result = String::from_chars(result.as_slice());
                 assert!(result.as_slice() == decoded,
                         format!("Incorrect decoding of {}:\n   {}\n!= {}\n{}",
                                 encoded, result.as_slice(), decoded, description))

src/tests.rs

@@ -116,14 +116,14 @@ fn parse_test_data(input: &str) -> Vec<Test> {
             continue
         }
         let mut pieces = line.split(' ').collect::<Vec<&str>>();
-        let expected_failure = *pieces.get(0) == "XFAIL";
+        let expected_failure = pieces[0] == "XFAIL";
         if expected_failure {
             pieces.shift();
         }
         let input = unescape(pieces.shift().unwrap());
         let mut test = Test {
             input: input,
-            base: if pieces.is_empty() || *pieces.get(0) == "" {
+            base: if pieces.is_empty() || pieces[0] == "" {
                 tests.last().unwrap().base.clone()
             } else {
                 unescape(pieces.shift().unwrap())

src/url.rs

@@ -18,7 +18,6 @@ extern crate serialize;
 
 use std::cmp;
 use std::hash;
-use std::str::from_utf8_lossy;
 use std::ascii::OwnedStrAsciiExt;
 
 use encoding::EncodingRef;
@@ -353,7 +352,7 @@ impl Host {
             }
         } else {
             let decoded = percent_decode(input.as_bytes());
-            let domain = from_utf8_lossy(decoded.as_slice());
+            let domain = String::from_utf8_lossy(decoded.as_slice());
             // TODO: Remove this check and use IDNA "domain to ASCII"
             if !domain.as_slice().is_ascii() {
                 Err("Non-ASCII domains (IDNA) are not supported yet.")