Upgrade to rustc 0.13.0-nightly (10d99a973 2014-12-31 21:01:42 +0000)

Author: SimonSapin

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "url"
-version = "0.2.9"
+version = "0.2.10"
 authors = [ "Simon Sapin <[email protected]>" ]
 
 description = "URL parser for Rust"

src/parser.rs

@@ -100,7 +100,7 @@ pub enum Context {
 
 
 pub fn parse_url(input: &str, parser: &UrlParser) -> ParseResult<Url> {
-    let input = input.trim_chars([' ', '\t', '\n', '\r', '\x0C'].as_slice());
+    let input = input.trim_matches([' ', '\t', '\n', '\r', '\x0C'].as_slice());
     let (scheme, remaining) = match parse_scheme(input, Context::UrlParser) {
         Some((scheme, remaining)) => (scheme, remaining),
         // No-scheme state

src/punycode.rs

@@ -46,7 +46,7 @@ fn adapt(mut delta: u32, num_points: u32, first_time: bool) -> u32 {
 /// This is a convenience wrapper around `decode`.
 #[inline]
 pub fn decode_to_string(input: &str) -> Option<String> {
-    decode(input).map(|chars| String::from_chars(chars.as_slice()))
+    decode(input).map(|chars| chars.into_iter().collect())
 }
 
 
@@ -222,7 +222,7 @@ mod tests {
         match decode(encoded) {
             None => panic!("Decoding {} failed.", encoded),
             Some(result) => {
-                let result = String::from_chars(result.as_slice());
+                let result = result.into_iter().collect::<String>();
                 assert!(result.as_slice() == decoded,
                         format!("Incorrect decoding of {}:\n   {}\n!= {}\n{}",
                                 encoded, result.as_slice(), decoded, description))

src/tests.rs

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