Merge branch 'main' into feat/rama-http-core

plabayo · Nov 8, 2024 · 3bd745a · 3bd745a
2 parents c794d0c + 932086e
commit 3bd745a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rama-http-backend/src/client/conn.rs b/rama-http-backend/src/client/conn.rs
@@ -116,7 +116,7 @@ where
                     }
                 });
 
-                let svc = HttpClientService(SendRequest::Http2(Mutex::new(sender)));
+                let svc = HttpClientService(SendRequest::Http2(sender));
 
                 Ok(EstablishedClientConnection {
                     ctx,

diff --git a/rama-http-backend/src/client/svc.rs b/rama-http-backend/src/client/svc.rs
@@ -14,10 +14,10 @@ use tokio::sync::Mutex;
 
 #[derive(Debug)]
 // TODO: once we have hyper as `rama_core` we can
-// drop this mutex as there is no inherint reason for `sender` to be mutable...
+// drop the cloning / mutex / something approach as we can operate on reference layer
 pub(super) enum SendRequest<Body> {
     Http1(Mutex<hyper::client::conn::http1::SendRequest<Body>>),
-    Http2(Mutex<hyper::client::conn::http2::SendRequest<Body>>),
+    Http2(hyper::client::conn::http2::SendRequest<Body>),
 }
 
 #[derive(Debug)]
@@ -49,7 +49,7 @@ where
 
         let resp = match &self.0 {
             SendRequest::Http1(sender) => sender.lock().await.send_request(req).await,
-            SendRequest::Http2(sender) => sender.lock().await.send_request(req).await,
+            SendRequest::Http2(sender) => sender.clone().send_request(req).await,
         }?;
 
         Ok(resp.map(rama_http_types::Body::new))