Upstream minurl::Url type for url parsing

bitreq/Cargo.toml

@@ -42,6 +42,8 @@ log = { version = "0.4.0", default-features = false, optional = true }
 [dev-dependencies]
 tiny_http = "0.12"
 tokio = { version = "1.0", default-features = false, features = ["macros", "rt-multi-thread", "time"] }
+proptest = { version = "1.5", default-features = false, features = ["std"] }
+url = { version = "2", default-features = false }
 
 [package.metadata.docs.rs]
 features = ["json-using-serde", "proxy", "https"]

bitreq/src/connection.rs

@@ -318,7 +318,7 @@ impl AsyncConnection {
                 // do proxy things
                 let mut tcp = Self::tcp_connect(&proxy.server, proxy.port).await?;
 
-                let proxy_request = proxy.connect(params.host, params.port.port());
+                let proxy_request = proxy.connect(params.host, params.port);
                 tcp.write_all(proxy_request.as_bytes()).await?;
                 tcp.flush().await?;
 
@@ -347,11 +347,11 @@ impl AsyncConnection {
 
                 Ok(tcp)
             }
-            None => Self::tcp_connect(params.host, params.port.port()).await,
+            None => Self::tcp_connect(params.host, params.port).await,
         }
 
         #[cfg(not(feature = "proxy"))]
-        Self::tcp_connect(&params.host, params.port.port()).await
+        Self::tcp_connect(&params.host, params.port).await
     }
 
     async fn timeout<O, F: Future<Output = O>>(timeout: Option<Instant>, f: F) -> Result<O, Error> {
@@ -678,7 +678,7 @@ impl Connection {
                 // do proxy things
                 let mut tcp = Self::tcp_connect(&proxy.server, proxy.port, timeout_at)?;
 
-                write!(tcp, "{}", proxy.connect(params.host, params.port.port()))?;
+                write!(tcp, "{}", proxy.connect(params.host, params.port))?;
                 tcp.flush()?;
 
                 // Max proxy response size to prevent unbounded memory allocation
@@ -706,11 +706,11 @@ impl Connection {
 
                 Ok(tcp)
             }
-            None => Self::tcp_connect(params.host, params.port.port(), timeout_at),
+            None => Self::tcp_connect(params.host, params.port, timeout_at),
         }
 
         #[cfg(not(feature = "proxy"))]
-        Self::tcp_connect(params.host, params.port.port(), timeout_at)
+        Self::tcp_connect(params.host, params.port, timeout_at)
     }
 
     /// Sends the [`Request`](struct.Request.html), consumes this

bitreq/src/lib.rs

@@ -254,11 +254,11 @@ mod client;
 #[cfg(feature = "std")]
 mod connection;
 mod error;
-mod http_url;
 #[cfg(feature = "proxy")]
 mod proxy;
 mod request;
 mod response;
+mod url;
 
 #[cfg(feature = "async")]
 pub use client::{Client, RequestExt};
@@ -269,3 +269,4 @@ pub use request::*;
 pub use response::Response;
 #[cfg(feature = "std")]
 pub use response::ResponseLazy;
+pub use url::{ParseError as UrlParseError, Url};