Add IntoResponseParts

axum-core/Cargo.toml

@@ -22,3 +22,4 @@ mime = "0.3.16"
 futures-util = "0.3"
 axum = { path = "../axum", version = "0.4" }
 hyper = "0.14"
+tokio = { version = "1.0", features = ["macros"] }

axum-core/src/extract/mod.rs

@@ -5,7 +5,6 @@
 //! [`axum::extract`]: https://docs.rs/axum/latest/axum/extract/index.html
 
 use self::rejection::*;
-use crate::response::IntoResponse;
 use async_trait::async_trait;
 use http::{Extensions, HeaderMap, Method, Request, Uri, Version};
 use std::convert::Infallible;
@@ -63,7 +62,7 @@ mod tuple;
 pub trait FromRequest<B>: Sized {
     /// If the extractor fails it'll use this "rejection" type. A rejection is
     /// a kind of error that can be converted into a response.
-    type Rejection: IntoResponse;
+    type Rejection: crate::response::IntoResponse;
 
     /// Perform the extraction.
     async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection>;

axum-core/src/extract/rejection.rs

@@ -1,8 +1,7 @@
 //! Rejection response types.
 
-use crate::body;
-use http::{Response, StatusCode};
-use http_body::Full;
+use crate::response::{IntoResponse, Response};
+use http::StatusCode;
 use std::fmt;
 
 /// Rejection type used if you try and extract the request body more than
@@ -15,11 +14,9 @@ impl BodyAlreadyExtracted {
     const BODY: &'static str = "Cannot have two request body extractors for a single handler";
 }
 
-impl crate::response::IntoResponse for BodyAlreadyExtracted {
-    fn into_response(self) -> crate::response::Response {
-        let mut res = Response::new(body::boxed(Full::from(Self::BODY)));
-        *res.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;
-        res
+impl IntoResponse for BodyAlreadyExtracted {
+    fn into_response(self) -> Response {
+        (StatusCode::INTERNAL_SERVER_ERROR, Self::BODY).into_response()
     }
 }
 

axum-core/src/macros.rs

@@ -20,12 +20,10 @@ macro_rules! define_rejection {
 
         impl crate::response::IntoResponse for $name {
             fn into_response(self) -> $crate::response::Response {
-                let body = http_body::Full::from(format!(concat!($body, ": {}"), self.0));
-                let body = $crate::body::boxed(body);
-                let mut res =
-                    http::Response::new(body);
-                *res.status_mut() = http::StatusCode::$status;
-                res
+                (
+                    http::StatusCode::$status,
+                    http_body::Full::from(format!(concat!($body, ": {}"), self.0))
+                ).into_response()
             }
         }