update

tokio-rs · Nov 14, 2023 · e5a7444 · e5a7444
1 parent 42b76bd
commit e5a7444
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/axum-core/src/ext_traits/request.rs b/axum-core/src/ext_traits/request.rs
@@ -261,27 +261,30 @@ pub trait RequestExt: sealed::Sealed + Sized {
 }
 
 impl RequestExt for Request {
-    async fn extract<E, M>(self) -> Result<E, E::Rejection>
+    fn extract<E, M>(self) -> impl Future<Output = Result<E, E::Rejection>> + Send
     where
         E: FromRequest<(), M> + 'static,
         M: 'static,
     {
-        self.extract_with_state(&()).await
+        self.extract_with_state(&())
     }
 
-    async fn extract_with_state<E, S, M>(self, state: &S) -> Result<E, E::Rejection>
+    fn extract_with_state<E, S, M>(
+        self,
+        state: &S,
+    ) -> impl Future<Output = Result<E, E::Rejection>> + Send
     where
         E: FromRequest<S, M> + 'static,
         S: Send + Sync,
     {
-        E::from_request(self, state).await
+        E::from_request(self, state)
     }
 
-    async fn extract_parts<E>(&mut self) -> Result<E, E::Rejection>
+    fn extract_parts<E>(&mut self) -> impl Future<Output = Result<E, E::Rejection>> + Send
     where
         E: FromRequestParts<()> + 'static,
     {
-        self.extract_parts_with_state(&()).await
+        self.extract_parts_with_state(&())
     }
 
     async fn extract_parts_with_state<'a, E, S>(

diff --git a/axum-core/src/ext_traits/request_parts.rs b/axum-core/src/ext_traits/request_parts.rs
@@ -52,7 +52,7 @@ pub trait RequestPartsExt: sealed::Sealed + Sized {
     ///     }
     /// }
     /// ```
-    fn extract<E>(&mut self) -> impl Future<Output = Result<E, E::Rejection>> + Send + '_
+    fn extract<E>(&mut self) -> impl Future<Output = Result<E, E::Rejection>> + Send
     where
         E: FromRequestParts<()> + 'static;
 
@@ -115,19 +115,22 @@ pub trait RequestPartsExt: sealed::Sealed + Sized {
 }
 
 impl RequestPartsExt for Parts {
-    async fn extract<E>(&mut self) -> Result<E, E::Rejection>
+    fn extract<E>(&mut self) -> impl Future<Output = Result<E, E::Rejection>> + Send
     where
         E: FromRequestParts<()> + 'static,
     {
-        self.extract_with_state(&()).await
+        self.extract_with_state(&())
     }
 
-    async fn extract_with_state<'a, E, S>(&'a mut self, state: &'a S) -> Result<E, E::Rejection>
+    fn extract_with_state<'a, E, S>(
+        &'a mut self,
+        state: &'a S,
+    ) -> impl Future<Output = Result<E, E::Rejection>> + Send + 'a
     where
         E: FromRequestParts<S> + 'static,
         S: Send + Sync,
     {
-        E::from_request_parts(self, state).await
+        E::from_request_parts(self, state)
     }
 }