Use feature flag when creating Request for hyper and h3 clients

Signed-off-by: Miguel Guarniz <mi9uel9@gmail.com>
seanmonstar · Aug 6, 2022 · 415c81b · 415c81b
1 parent 7147457
commit 415c81b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 24 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -139,7 +139,7 @@ tokio-socks = { version = "0.5.1", optional = true }
 ## trust-dns
 trust-dns-resolver = { version = "0.21", optional = true }
 
-# http3 experimental support
+# HTTP/3 experimental support
 h3 = { git = "https://github.com/hyperium/h3" }
 h3-quinn = { git = "https://github.com/hyperium/h3" }
 quinn = { version = "0.8", default-features = false, features = ["tls-rustls", "ring"] }

diff --git a/examples/h3_simple.rs b/examples/h3_simple.rs
@@ -11,15 +11,10 @@ async fn main() -> Result<(), reqwest::Error> {
     use reqwest::{Client, IntoUrl, Response};
 
     async fn get<T: IntoUrl + Clone>(url: T) -> reqwest::Result<Response> {
-        let client = Client::builder()
+        Client::builder()
             .http3_prior_knowledge()
-            .build()?;
-
-        client.get(url.clone())
-            .version(Version::HTTP_3)
-            .send()
-            .await.unwrap();
-        client.get(url)
+            .build()?
+            .get(url)
             .version(Version::HTTP_3)
             .send()
             .await

diff --git a/src/async_impl/client.rs b/src/async_impl/client.rs
@@ -1524,29 +1524,23 @@ impl Client {
 
         self.proxy_auth(&uri, &mut headers);
 
+        let builder = hyper::Request::builder()
+            .method(method.clone())
+            .uri(uri)
+            .version(version);
+
         let in_flight = match version {
             #[cfg(feature = "http3")]
             http::Version::HTTP_3 => {
-                let mut req = hyper::Request::builder()
-                    .method(method.clone())
-                    .uri(uri)
-                    .version(version)
-                    .body(())
-                    .expect("valid request parts");
+                let mut req = builder.body(()).expect("valid request parts");
                 *req.headers_mut() = headers.clone();
                 ResponseFuture::H3(self.inner.h3_client.request(req))
-            }
+            },
             _ => {
-                let mut req = hyper::Request::builder()
-                    .method(method.clone())
-                    .uri(uri)
-                    .version(version)
-                    .body(body.into_stream())
-                    .expect("valid request parts");
-
+                let mut req = builder.body(body.into_stream()).expect("valid request parts");
                 *req.headers_mut() = headers.clone();
                 ResponseFuture::Default(self.inner.hyper.request(req))
-            }
+            },
         };
 
         let timeout = timeout

diff --git a/src/async_impl/h3_client/pool.rs b/src/async_impl/h3_client/pool.rs
@@ -96,6 +96,7 @@ impl PoolClient {
         }
     }
 
+    // TODO: add support for sending data.
     pub async fn send_request(&mut self, req: Request<()>) -> Result<Response<Body>, BoxError> {
         let mut stream = self.tx.send_request(req).await?;
         stream.finish().await?;