Use form_urlencoded directly

Author: Johannesd3

Cargo.lock

@@ -10,6 +10,7 @@ edition = "2018"
 [dependencies]
 aes-ctr = "0.6"
 base64 = "0.13"
+form_urlencoded = "1.0"
 futures-core = "0.3"
 hmac = "0.10"
 hyper = { version = "0.14", features = ["server", "http1", "tcp"] }
@@ -22,7 +23,6 @@ serde_urlencoded = "0.7"
 sha-1 = "0.9"
 thiserror = "1.0"
 tokio = { version = "1.0", features = ["sync", "rt"] }
-url = "2.0"
 
 [dev-dependencies]
 futures = "0.3"

discovery/Cargo.toml

@@ -20,7 +20,7 @@ pub(crate) trait SerdeRequest: Sized + Serialize {
 
     /// Converts a x-www-form-urlencoded byte slice into this type.
     fn from_bytes(body: &[u8]) -> Result<Self, ParseError> {
-        let parser = url::form_urlencoded::parse(body);
+        let parser = form_urlencoded::parse(body);
         let de = serde_urlencoded::Deserializer::new(parser);
         Self::deserialize(de)
     }
@@ -219,7 +219,7 @@ mod test {
         ];
 
         for &(input, ref expected) in conversions {
-            let de = serde_urlencoded::de::Deserializer::new(url::form_urlencoded::parse(input));
+            let de = serde_urlencoded::de::Deserializer::new(form_urlencoded::parse(input));
             assert_eq!(GetRequest::deserialize(de), expected.clone())
         }
     }
@@ -271,7 +271,7 @@ mod test {
         ];
 
         for &(input, ref expected) in conversions {
-            let de = serde_urlencoded::de::Deserializer::new(url::form_urlencoded::parse(input));
+            let de = serde_urlencoded::de::Deserializer::new(form_urlencoded::parse(input));
             assert_eq!(
                 PostRequest::deserialize(de),
                 expected.clone().map(PostRequest::AddUser)