refactor: RPITIT and AFIT

Cargo.toml

@@ -44,7 +44,7 @@ homepage = "https://viz.rs"
 documentation = "https://docs.rs/viz"
 repository = "https://github.com/viz-rs/viz"
 license = "MIT"
-rust-version = "1.63"                           # follows `tokio` and `hyper`
+rust-version = "1.75"
 
 [workspace.dependencies]
 viz = { version = "0.7.1", path = "viz" }

viz-core/src/from_request.rs

@@ -1,18 +1,17 @@
 //! Extracts data from the [`Request`] by types.
 
-use crate::{IntoResponse, Request};
+use crate::{Future, IntoResponse, Request};
 
 /// An interface for extracting data from the HTTP [`Request`].
-#[crate::async_trait]
 pub trait FromRequest: Sized {
     /// The type returned in the event of a conversion error.
     type Error: IntoResponse;
 
     /// Extracts this type from the HTTP [`Request`].
-    async fn extract(req: &mut Request) -> Result<Self, Self::Error>;
+    #[must_use]
+    fn extract(req: &mut Request) -> impl Future<Output = Result<Self, Self::Error>> + Send;
 }
 
-#[crate::async_trait]
 impl<T> FromRequest for Option<T>
 where
     T: FromRequest,
@@ -24,7 +23,6 @@ where
     }
 }
 
-#[crate::async_trait]
 impl<T> FromRequest for Result<T, T::Error>
 where
     T: FromRequest,

viz-core/src/handler/boxed.rs

@@ -10,7 +10,7 @@ impl<I, O> BoxHandler<I, O> {
     /// Creates a new `BoxHandler`.
     pub fn new<H>(h: H) -> Self
     where
-        H: Handler<I, Output = O> + Send + Sync + Clone + 'static,
+        H: Handler<I, Output = O> + Clone,
     {
         Self(Box::new(h))
     }

viz-core/src/macros.rs

@@ -8,7 +8,6 @@ macro_rules! tuple_impls {
     };
     // "Private" internal implementation
     (@impl $( $T:ident )*) => {
-        #[crate::async_trait]
         impl<$($T,)*> FromRequest for ($($T,)*)
         where
             $($T: FromRequest + Send,)*

viz-core/src/middleware/csrf.rs

@@ -36,7 +36,6 @@ pub enum Store {
 #[derive(Debug, Clone)]
 pub struct CsrfToken(pub String);
 
-#[crate::async_trait]
 impl FromRequest for CsrfToken {
     type Error = Error;
 

viz-core/src/request.rs

@@ -1,7 +1,7 @@
 use crate::{
     header,
     types::{PayloadError, RealIp},
-    Body, BodyState, Bytes, FromRequest, Request, Result,
+    Body, BodyState, Bytes, FromRequest, Future, Request, Result,
 };
 use headers::HeaderMapExt;
 use http_body_util::{BodyExt, Collected};
@@ -36,7 +36,6 @@ use crate::types::Session;
 use crate::types::{ParamsError, PathDeserializer, RouteInfo};
 
 /// The [`Request`] Extension.
-#[crate::async_trait]
 pub trait RequestExt: private::Sealed + Sized {
     /// Get URL's schema of this request.
     fn schema(&self) -> Option<&http::uri::Scheme>;
@@ -75,7 +74,7 @@ pub trait RequestExt: private::Sealed + Sized {
     fn content_type(&self) -> Option<mime::Mime>;
 
     /// Extract the data from this request by the specified type.
-    async fn extract<T>(&mut self) -> Result<T, T::Error>
+    fn extract<T>(&mut self) -> impl Future<Output = Result<T, T::Error>> + Send
     where
         T: FromRequest;
 
@@ -90,33 +89,37 @@ pub trait RequestExt: private::Sealed + Sized {
     /// Return with a [Bytes][mdn] representation of the request body.
     ///
     /// [mdn]: <https://developer.mozilla.org/en-US/docs/Web/API/Response/arrayBuffer>
-    async fn bytes(&mut self) -> Result<Bytes, PayloadError>;
+    fn bytes(&mut self) -> impl Future<Output = Result<Bytes, PayloadError>> + Send;
 
     /// Return with a [Bytes][mdn]  by a limit representation of the request body.
     ///
     /// [mdn]: <https://developer.mozilla.org/en-US/docs/Web/API/Response/arrayBuffer>
     #[cfg(feature = "limits")]
-    async fn bytes_with(&mut self, limit: Option<u64>, max: u64) -> Result<Bytes, PayloadError>;
+    fn bytes_with(
+        &mut self,
+        limit: Option<u64>,
+        max: u64,
+    ) -> impl Future<Output = Result<Bytes, PayloadError>> + Send;
 
     /// Return with a [Text][mdn] representation of the request body.
     ///
     /// [mdn]: <https://developer.mozilla.org/en-US/docs/Web/API/Response/text>
-    async fn text(&mut self) -> Result<String, PayloadError>;
+    fn text(&mut self) -> impl Future<Output = Result<String, PayloadError>> + Send;
 
     /// Return with a `application/x-www-form-urlencoded` [FormData][mdn] by the specified type
     /// representation of the request body.
     ///
     /// [mdn]: <https://developer.mozilla.org/en-US/docs/Web/API/FormData>
     #[cfg(feature = "form")]
-    async fn form<T>(&mut self) -> Result<T, PayloadError>
+    fn form<T>(&mut self) -> impl Future<Output = Result<T, PayloadError>> + Send
     where
         T: serde::de::DeserializeOwned;
 
     /// Return with a [JSON][mdn] by the specified type representation of the request body.
     ///
     /// [mdn]: <https://developer.mozilla.org/en-US/docs/Web/API/Response/json>
     #[cfg(feature = "json")]
-    async fn json<T>(&mut self) -> Result<T, PayloadError>
+    fn json<T>(&mut self) -> impl Future<Output = Result<T, PayloadError>> + Send
     where
         T: serde::de::DeserializeOwned;
 
@@ -125,7 +128,7 @@ pub trait RequestExt: private::Sealed + Sized {
     ///
     /// [mdn]: <https://developer.mozilla.org/en-US/docs/Web/API/FormData>
     #[cfg(feature = "multipart")]
-    async fn multipart(&mut self) -> Result<Multipart, PayloadError>;
+    fn multipart(&mut self) -> impl Future<Output = Result<Multipart, PayloadError>> + Send;
 
     /// Return a shared state by the specified type.
     #[cfg(feature = "state")]
@@ -193,7 +196,6 @@ pub trait RequestExt: private::Sealed + Sized {
     fn realip(&self) -> Option<RealIp>;
 }
 
-#[crate::async_trait]
 impl RequestExt for Request {
     fn schema(&self) -> Option<&http::uri::Scheme> {
         self.uri().scheme()

viz-core/src/response.rs

@@ -1,10 +1,9 @@
 use futures_util::Stream;
 use http_body_util::Full;
 
-use crate::{header, Body, BoxError, Bytes, Error, Response, Result, StatusCode};
+use crate::{header, Body, BoxError, Bytes, Error, Future, Response, Result, StatusCode};
 
 /// The [`Response`] Extension.
-#[crate::async_trait]
 pub trait ResponseExt: private::Sealed + Sized {
     /// Get the size of this response's body.
     fn content_length(&self) -> Option<u64>;
@@ -96,7 +95,7 @@ pub trait ResponseExt: private::Sealed + Sized {
 
     /// Downloads transfers the file from path as an attachment.
     #[cfg(feature = "fs")]
-    async fn download<T>(path: T, name: Option<&str>) -> Result<Self>
+    fn download<T>(path: T, name: Option<&str>) -> impl Future<Output = Result<Self>> + Send
     where
         T: AsRef<std::path::Path> + Send;
 
@@ -186,7 +185,6 @@ pub trait ResponseExt: private::Sealed + Sized {
     }
 }
 
-#[crate::async_trait]
 impl ResponseExt for Response {
     fn content_length(&self) -> Option<u64> {
         self.headers()

viz-core/src/types/cookie.rs

@@ -192,7 +192,6 @@ impl Cookies {
     }
 }
 
-#[crate::async_trait]
 impl FromRequest for Cookies {
     type Error = CookiesError;
 

viz-core/src/types/form.rs

@@ -81,7 +81,6 @@ impl<T> Payload for Form<T> {
     }
 }
 
-#[crate::async_trait]
 impl<T> FromRequest for Form<T>
 where
     T: DeserializeOwned,

viz-core/src/types/header.rs

@@ -66,7 +66,6 @@ where
     }
 }
 
-#[crate::async_trait]
 impl<T> FromRequest for Header<T>
 where
     T: headers::Header,

viz-core/src/types/json.rs

@@ -80,7 +80,6 @@ impl<T> Payload for Json<T> {
     }
 }
 
-#[crate::async_trait]
 impl<T> FromRequest for Json<T>
 where
     T: serde::de::DeserializeOwned,

viz-core/src/types/limits.rs

@@ -81,7 +81,6 @@ impl Limits {
     }
 }
 
-#[crate::async_trait]
 impl FromRequest for Limits {
     type Error = Infallible;
 

viz-core/src/types/multipart.rs

@@ -26,7 +26,6 @@ impl<T> Payload for Multipart<T> {
     }
 }
 
-#[crate::async_trait]
 impl FromRequest for Multipart {
     type Error = PayloadError;
 

viz-core/src/types/params.rs

@@ -76,7 +76,6 @@ impl Params {
     }
 }
 
-#[crate::async_trait]
 impl<T> FromRequest for Params<T>
 where
     T: DeserializeOwned,

viz-core/src/types/query.rs

@@ -64,7 +64,6 @@ where
     }
 }
 
-#[crate::async_trait]
 impl<T> FromRequest for Query<T>
 where
     T: DeserializeOwned,

viz-core/src/types/session.rs

@@ -170,7 +170,6 @@ impl fmt::Debug for Session {
     }
 }
 
-#[crate::async_trait]
 impl FromRequest for Session {
     type Error = Infallible;
 

viz-core/src/types/state.rs

@@ -49,7 +49,6 @@ impl<T> DerefMut for State<T> {
     }
 }
 
-#[crate::async_trait]
 impl<T> FromRequest for State<T>
 where
     T: Clone + Send + Sync + 'static,

viz-core/src/types/websocket.rs

@@ -98,7 +98,6 @@ impl WebSocket {
     }
 }
 
-#[crate::async_trait]
 impl FromRequest for WebSocket {
     type Error = WebSocketError;
 

viz-core/tests/from_request.rs

@@ -2,7 +2,7 @@ use headers::HeaderValue;
 use viz_core::{
     header::{CONTENT_LENGTH, CONTENT_TYPE},
     types::{Form, Json, Limits, PayloadError, State, StateError},
-    Body, FromRequest, Request, RequestExt, Result,
+    Body, Request, RequestExt, Result,
 };
 
 #[tokio::test]
@@ -16,7 +16,7 @@ async fn from_request() -> Result<()> {
         .body(Body::Empty)?;
     req.extensions_mut().insert(Limits::default());
 
-    let result: Result<Json<Option<String>>, PayloadError> = FromRequest::extract(&mut req).await;
+    let result: Result<Json<Option<String>>, PayloadError> = req.extract().await;
     assert!(result.is_err());
 
     let mut req = Request::builder()

viz-core/tests/handler.rs

@@ -22,18 +22,16 @@ async fn handler() -> Result<()> {
 
     struct MyU8(u8);
 
-    #[async_trait]
     impl FromRequest for MyU8 {
         type Error = std::convert::Infallible;
 
-        async fn extract(_req: &mut Request) -> Result<Self, Self::Error> {
+        async fn extract(_: &mut Request) -> Result<Self, Self::Error> {
             Ok(MyU8(u8::MAX))
         }
     }
 
     struct MyString(String);
 
-    #[async_trait]
     impl FromRequest for MyString {
         type Error = std::convert::Infallible;
 

viz-macros/tests/handler.rs

@@ -1,15 +1,12 @@
 #![allow(clippy::unused_async)]
 #![allow(clippy::unnecessary_wraps)]
 
-use viz_core::{
-    async_trait, Error, FromRequest, Handler, IntoResponse, Request, Result, StatusCode,
-};
+use viz_core::{Error, FromRequest, Handler, IntoResponse, Request, Result, StatusCode};
 use viz_macros::handler;
 
 #[derive(Debug)]
 struct Foo;
 
-#[async_trait]
 impl FromRequest for Foo {
     type Error = Error;
 
@@ -21,7 +18,6 @@ impl FromRequest for Foo {
 #[derive(Debug)]
 struct Bar;
 
-#[async_trait]
 impl FromRequest for Bar {
     type Error = Error;
 

viz/src/lib.rs

@@ -342,10 +342,9 @@
 //!
 //! ```
 //! # use std::{cmp, convert::Infallible};
-//! # use viz::{async_trait, FromRequest, Request, RequestExt, Result};
+//! # use viz::{FromRequest, Request, RequestExt, Result};
 //! struct Counter(u16);
 //!
-//! #[async_trait]
 //! impl FromRequest for Counter {
 //!     type Error = Infallible;
 //!     async fn extract(req: &mut Request) -> Result<Self, Self::Error> {