Allow conversions in Request,Response constructors

yoshuawuyts · yoshuawuyts · commit 0a513658c7e1 · 2020-05-13T20:31:55.000+02:00
We're waiting on servo/rust-url#569 to be published for URL shorthands to be practical; but once it lands it should be really nice to use
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,7 +35,7 @@ cookie = "0.12.0"
 infer = "0.1.2"
 omnom = "2.1.1"
 pin-project-lite = "0.1.0"
-url = "2.1.0"
+url = "2.1.1"
 serde_json = "1.0.51"
 serde = { version = "1.0.106", features = ["derive"] }
 serde_urlencoded = "0.6.1"
diff --git a/src/hyperium_http.rs b/src/hyperium_http.rs
@@ -120,8 +120,7 @@ impl From<Request> for http::Request<Body> {
 impl From<http::Response<Body>> for Response {
     fn from(res: http::Response<Body>) -> Self {
         let (parts, body) = res.into_parts();
-        let status = parts.status.into();
-        let mut res = Response::new(status);
+        let mut res = Response::new(parts.status);
         res.set_body(body);
         res.set_version(Some(parts.version.into()));
         hyperium_headers_to_headers(parts.headers, res.as_mut());
diff --git a/src/request.rs b/src/request.rs
@@ -1,7 +1,7 @@
 use async_std::io::{self, BufRead, Read};
 use async_std::sync;
 
-use std::convert::Into;
+use std::convert::{Into, TryInto};
 use std::mem;
 use std::ops::Index;
 use std::pin::Pin;
@@ -45,7 +45,12 @@ pin_project_lite::pin_project! {
 
 impl Request {
     /// Create a new request.
-    pub fn new(method: Method, url: Url) -> Self {
+    pub fn new<U>(method: Method, url: U) -> Self
+    where
+        U: TryInto<Url>,
+        U::Error: std::fmt::Debug,
+    {
+        let url = url.try_into().expect("Could not convert into a valid url");
         let (sender, receiver) = sync::channel(1);
         Self {
             method,
@@ -687,7 +692,8 @@ mod tests {
     use super::*;
 
     fn build_test_request() -> Request {
-        Request::new(Method::Get, "http://irrelevant/".parse().unwrap())
+        let url = Url::parse("http://irrelevant/").unwrap();
+        Request::new(Method::Get, url)
     }
 
     fn set_x_forwarded_for(request: &mut Request, client: &'static str) {
diff --git a/src/response.rs b/src/response.rs
@@ -1,7 +1,8 @@
 use async_std::io::{self, BufRead, Read};
 use async_std::sync;
 
-use std::convert::Into;
+use std::convert::{Into, TryInto};
+use std::fmt::Debug;
 use std::mem;
 use std::ops::Index;
 use std::pin::Pin;
@@ -48,7 +49,14 @@ pin_project_lite::pin_project! {
 
 impl Response {
     /// Create a new response.
-    pub fn new(status: StatusCode) -> Self {
+    pub fn new<S>(status: S) -> Self
+    where
+        S: TryInto<StatusCode>,
+        S::Error: Debug,
+    {
+        let status = status
+            .try_into()
+            .expect("Could not convert into a valid `StatusCode`");
         let (sender, receiver) = sync::channel(1);
         Self {
             status,
diff --git a/src/trailers.rs b/src/trailers.rs
@@ -121,7 +121,7 @@ impl Trailers {
     }
 
     /// Get a reference to a header.
-    pub fn get(&self, name: &impl Into<HeaderName>) -> Option<&HeaderValues> {
+    pub fn get(&self, name: impl Into<HeaderName>) -> Option<&HeaderValues> {
         self.headers.get(name)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ impl Trailers {`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`/// Get a reference to a header.`
`124`		`- pub fn get(&self, name: &impl Into<HeaderName>) -> Option<&HeaderValues> {`
	`124`	`+ pub fn get(&self, name: impl Into<HeaderName>) -> Option<&HeaderValues> {`
`125`	`125`	`self.headers.get(name)`
`126`	`126`	`}`
`127`	`127`