From 0403e194767a6bac55e8ce0842c40a19b9dd4cd9 Mon Sep 17 00:00:00 2001
From: edelangh <edelangh@student.42.fr>
Date: Tue, 16 Oct 2018 23:52:34 +0200
Subject: [PATCH] Update dep url to 1.7.1

---
 etc/api/type-api.yaml        |  2 +-
 src/mako/api/lib/mbuild.mako | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/etc/api/type-api.yaml b/etc/api/type-api.yaml
index 228f43f5c9..b9462e878d 100644
--- a/etc/api/type-api.yaml
+++ b/etc/api/type-api.yaml
@@ -24,4 +24,4 @@ cargo:
   keywords: [protocol, web, api]
   doc_base_url: https://docs.rs
   dependencies:
-    - url = "= 0.5"
+    - url = "= 1.7"
diff --git a/src/mako/api/lib/mbuild.mako b/src/mako/api/lib/mbuild.mako
index 9d26fb2122..50d847ebca 100644
--- a/src/mako/api/lib/mbuild.mako
+++ b/src/mako/api/lib/mbuild.mako
@@ -499,7 +499,7 @@ match result {
         };
         dlg.begin(MethodInfo { id: "${m.id}",
                                http_method: ${method_name_to_variant(m.httpMethod)} });
-        let mut params: Vec<(&str, String)> = Vec::with_capacity((${len(params) + len(reserved_params)} + ${paddfields}.len()));
+        let mut params: Vec<(&str, String)> = Vec::with_capacity(${len(params) + len(reserved_params)} + ${paddfields}.len());
 <%
     if media_params and 'mediaUpload' in m:
         upload_type_map = dict()
@@ -639,7 +639,7 @@ else {
             }
             % if URL_ENCODE in special_cases:
             if find_this.as_bytes()[1] == '+' as u8 {
-                replace_with = percent_encode(replace_with.as_bytes(), DEFAULT_ENCODE_SET);
+                replace_with = percent_encode(replace_with.as_bytes(), DEFAULT_ENCODE_SET).to_string();
             }
             % endif
             url = url.replace(find_this, ${url_replace_arg});
@@ -658,10 +658,7 @@ else {
         }
         % endif
 
-        if params.len() > 0 {
-            url.push('?');
-            url.push_str(&url::form_urlencoded::serialize(params));
-        }
+        let url = hyper::Url::parse_with_params(&url, params).unwrap();
 
         % if request_value:
         let mut json_mime_type = mime::Mime(mime::TopLevel::Application, mime::SubLevel::Json, Default::default());
@@ -731,7 +728,7 @@ else {
                 };
             % endif
                 let mut client = &mut *self.hub.client.borrow_mut();
-                let mut req = client.borrow_mut().request(${method_name_to_variant(m.httpMethod)}, &url)
+                let mut req = client.borrow_mut().request(${method_name_to_variant(m.httpMethod)}, url.clone())
                     .header(UserAgent(self.hub._user_agent.clone()))\
                     % if default_scope: