upgrade url to 1.2

This was a bit involved, but wasn't too bad, thanks to @simonspain's work here: https://github.com/servo/rust-url/blob/master/UPGRADING.md

Author: steveklabnik

Cargo.lock

@@ -23,7 +23,7 @@ time = "0.1"
 git2 = "0.4"
 flate2 = "0.2"
 semver = "0.2"
-url = "0.5.0"
+url = "1.2.1"
 postgres = { version = "0.11", features = ["time"] }
 r2d2 = "0.6.0"
 r2d2_postgres = "0.10"

Cargo.toml

@@ -18,7 +18,7 @@ use rustc_serialize::hex::ToHex;
 use rustc_serialize::json;
 use semver;
 use time::{Timespec, Duration};
-use url::{self, Url};
+use url::Url;
 
 use {Model, User, Keyword, Version};
 use app::{App, RequestApp};
@@ -182,17 +182,14 @@ impl Crate {
             let url = try!(Url::parse(url).map_err(|_| {
                 human(format!("`{}` is not a valid url: `{}`", field, url))
             }));
-            match &url.scheme[..] {
+            match &url.scheme()[..] {
                 "http" | "https" => {}
                 s => return Err(human(format!("`{}` has an invalid url \
                                                scheme: `{}`", field, s)))
             }
-            match url.scheme_data {
-                url::SchemeData::Relative(..) => {}
-                url::SchemeData::NonRelative(..) => {
-                    return Err(human(format!("`{}` must have relative scheme \
-                                              data: {}", field, url)))
-                }
+            if url.cannot_be_a_base() {
+                return Err(human(format!("`{}` must have relative scheme \
+                                                        data: {}", field, url)))
             }
             Ok(())
         }

src/krate.rs

@@ -78,7 +78,8 @@ impl<'a> RequestUtils for Request + 'a {
     fn query(&self) -> HashMap<String, String> {
         url::form_urlencoded::parse(self.query_string().unwrap_or("")
                                         .as_bytes())
-            .into_iter().collect()
+            .map(|(a, b)| (a.into_owned(), b.into_owned()))
+            .collect()
     }
 
     fn redirect(&self, url: String) -> Response {

src/util/mod.rs

@@ -225,7 +225,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
     // Extract all ids requested.
     let query = url::form_urlencoded::parse(req.query_string().unwrap_or("")
                                                .as_bytes());
-    let ids = query.iter().filter_map(|&(ref a, ref b)| {
+    let ids = query.filter_map(|(ref a, ref b)| {
         if *a == "ids[]" {
             b.parse().ok()
         } else {