Use HttpBody type alias internally (#624)

* use 'crate::body::HttpBody' instead of 'http_body::Body'

* use 'crate::body::Bytes' instead of 'bytes::Bytes'

* rustfmt

* fix warning

* Update axum/src/routing/method_routing.rs

Co-authored-by: David Pedersen <david.pdrsn@gmail.com>

* Update axum/src/routing/method_routing.rs

Co-authored-by: David Pedersen <david.pdrsn@gmail.com>

Co-authored-by: David Pedersen <david.pdrsn@gmail.com>

axum/src/body/mod.rs

@@ -17,5 +17,5 @@ pub use bytes::Bytes;
 pub use axum_core::body::{boxed, BoxBody};
 
 pub(crate) fn empty() -> BoxBody {
-    boxed(http_body::Empty::new())
+    boxed(Empty::new())
 }

axum/src/body/stream_body.rs

@@ -1,15 +1,13 @@
 use crate::{
-    body,
+    body::{self, Bytes, HttpBody},
     response::{IntoResponse, Response},
     BoxError, Error,
 };
-use bytes::Bytes;
 use futures_util::{
     ready,
     stream::{self, TryStream},
 };
 use http::HeaderMap;
-use http_body::Body;
 use pin_project_lite::pin_project;
 use std::{
     fmt,
@@ -98,7 +96,7 @@ impl<S> fmt::Debug for StreamBody<S> {
     }
 }
 
-impl<S> Body for StreamBody<S>
+impl<S> HttpBody for StreamBody<S>
 where
     S: TryStream,
     S::Ok: Into<Bytes>,

axum/src/docs/extract.md

@@ -413,7 +413,7 @@ use std::{
 use tower_http::map_request_body::MapRequestBodyLayer;
 use axum::{
     extract::{self, BodyStream},
-    body::Body,
+    body::{Body, HttpBody},
     routing::get,
     http::{header::HeaderMap, Request},
     Router,
@@ -421,9 +421,9 @@ use axum::{
 
 struct MyBody<B>(B);
 
-impl<B> http_body::Body for MyBody<B>
+impl<B> HttpBody for MyBody<B>
 where
-    B: http_body::Body + Unpin,
+    B: HttpBody + Unpin,
 {
     type Data = B::Data;
     type Error = B::Error;

axum/src/extract/content_length_limit.rs

@@ -80,8 +80,7 @@ impl<T, const N: u64> Deref for ContentLengthLimit<T, N> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{routing::post, test_helpers::*, Router};
+    use crate::{body::Bytes, routing::post, test_helpers::*, Router};
-    use bytes::Bytes;
     use http::StatusCode;
     use serde::Deserialize;
 
@@ -127,7 +126,7 @@ mod tests {
         let res = client
             .post("/")
             .body(reqwest::Body::wrap_stream(futures_util::stream::iter(
-                vec![Ok::<_, std::io::Error>(bytes::Bytes::new())],
+                vec![Ok::<_, std::io::Error>(Bytes::new())],
             )))
             .send()
             .await;

axum/src/extract/extractor_middleware.rs

@@ -4,10 +4,10 @@
 
 use super::{FromRequest, RequestParts};
 use crate::{
+    body::{Bytes, HttpBody},
     response::{IntoResponse, Response},
     BoxError,
 };
-use bytes::Bytes;
 use futures_util::{future::BoxFuture, ready};
 use http::Request;
 use pin_project_lite::pin_project;
@@ -170,7 +170,7 @@ where
     E: FromRequest<ReqBody> + 'static,
     ReqBody: Default + Send + 'static,
     S: Service<Request<ReqBody>, Response = Response<ResBody>> + Clone,
-    ResBody: http_body::Body<Data = Bytes> + Send + 'static,
+    ResBody: HttpBody<Data = Bytes> + Send + 'static,
     ResBody::Error: Into<BoxError>,
 {
     type Response = Response;
@@ -229,7 +229,7 @@ where
     E: FromRequest<ReqBody>,
     S: Service<Request<ReqBody>, Response = Response<ResBody>>,
     ReqBody: Default,
-    ResBody: http_body::Body<Data = Bytes> + Send + 'static,
+    ResBody: HttpBody<Data = Bytes> + Send + 'static,
     ResBody::Error: Into<BoxError>,
 {
     type Output = Result<Response, S::Error>;

axum/src/extract/form.rs

@@ -1,4 +1,5 @@
 use super::{has_content_type, rejection::*, FromRequest, RequestParts};
+use crate::body::{Bytes, HttpBody};
 use crate::BoxError;
 use async_trait::async_trait;
 use http::Method;
@@ -46,7 +47,7 @@ pub struct Form<T>(pub T);
 impl<T, B> FromRequest<B> for Form<T>
 where
     T: DeserializeOwned,
-    B: http_body::Body + Send,
+    B: HttpBody + Send,
     B::Data: Send,
     B::Error: Into<BoxError>,
 {
@@ -63,7 +64,7 @@ where
                 return Err(InvalidFormContentType.into());
             }
 
-            let bytes = bytes::Bytes::from_request(req).await?;
+            let bytes = Bytes::from_request(req).await?;
             let value = serde_urlencoded::from_bytes(&bytes)
                 .map_err(FailedToDeserializeQueryString::new::<T, _>)?;
 
@@ -83,6 +84,7 @@ impl<T> Deref for Form<T> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::body::{Empty, Full};
     use crate::extract::RequestParts;
     use http::Request;
     use serde::{Deserialize, Serialize};
@@ -98,7 +100,7 @@ mod tests {
         let mut req = RequestParts::new(
             Request::builder()
                 .uri(uri.as_ref())
-                .body(http_body::Empty::<bytes::Bytes>::new())
+                .body(Empty::<Bytes>::new())
                 .unwrap(),
         );
         assert_eq!(Form::<T>::from_request(&mut req).await.unwrap().0, value);
@@ -113,7 +115,7 @@ mod tests {
                     http::header::CONTENT_TYPE,
                     mime::APPLICATION_WWW_FORM_URLENCODED.as_ref(),
                 )
-                .body(http_body::Full::<bytes::Bytes>::new(
+                .body(Full::<Bytes>::new(
                     serde_urlencoded::to_string(&value).unwrap().into(),
                 ))
                 .unwrap(),
@@ -179,7 +181,7 @@ mod tests {
                 .uri("http://example.com/test")
                 .method(Method::POST)
                 .header(http::header::CONTENT_TYPE, mime::APPLICATION_JSON.as_ref())
-                .body(http_body::Full::<bytes::Bytes>::new(
+                .body(Full::<Bytes>::new(
                     serde_urlencoded::to_string(&Pagination {
                         size: Some(10),
                         page: None,

axum/src/extract/multipart.rs

@@ -3,9 +3,9 @@
 //! See [`Multipart`] for more details.
 
 use super::{rejection::*, BodyStream, FromRequest, RequestParts};
+use crate::body::{Bytes, HttpBody};
 use crate::BoxError;
 use async_trait::async_trait;
-use bytes::Bytes;
 use futures_util::stream::Stream;
 use http::header::{HeaderMap, CONTENT_TYPE};
 use mime::Mime;
@@ -52,7 +52,7 @@ pub struct Multipart {
 #[async_trait]
 impl<B> FromRequest<B> for Multipart
 where
-    B: http_body::Body<Data = Bytes> + Default + Unpin + Send + 'static,
+    B: HttpBody<Data = Bytes> + Default + Unpin + Send + 'static,
     B::Error: Into<BoxError>,
 {
     type Rejection = MultipartRejection;

axum/src/extract/rejection.rs

@@ -1,11 +1,10 @@
 //! Rejection response types.
 
 use crate::{
-    body::boxed,
+    body::{boxed, Full},
     response::{IntoResponse, Response},
     BoxError, Error,
 };
-use http_body::Full;
 
 pub use crate::extract::path::FailedToDeserializePathParams;
 pub use axum_core::extract::rejection::*;

axum/src/extract/request_parts.rs

@@ -1,10 +1,11 @@
 use super::{rejection::*, take_body, Extension, FromRequest, RequestParts};
-use crate::{body::Body, BoxError, Error};
+use crate::{
+    body::{Body, Bytes, HttpBody},
+    BoxError, Error,
+};
 use async_trait::async_trait;
-use bytes::Bytes;
 use futures_util::stream::Stream;
 use http::Uri;
-use http_body::Body as HttpBody;
 use std::{
     convert::Infallible,
     fmt,
@@ -93,7 +94,7 @@ where
 /// [`Stream`]: https://docs.rs/futures/latest/futures/stream/trait.Stream.html
 /// [`body::Body`]: crate::body::Body
 pub struct BodyStream(
-    SyncWrapper<Pin<Box<dyn http_body::Body<Data = Bytes, Error = Error> + Send + 'static>>>,
+    SyncWrapper<Pin<Box<dyn HttpBody<Data = Bytes, Error = Error> + Send + 'static>>>,
 );
 
 impl Stream for BodyStream {

axum/src/extract/ws.rs

@@ -65,9 +65,12 @@
 
 use self::rejection::*;
 use super::{rejection::*, FromRequest, RequestParts};
-use crate::{body, response::Response, Error};
+use crate::{
+    body::{self, Bytes},
+    response::Response,
+    Error,
+};
 use async_trait::async_trait;
-use bytes::Bytes;
 use futures_util::{
     sink::{Sink, SinkExt},
     stream::{Stream, StreamExt},

axum/src/handler/mod.rs

@@ -5,7 +5,7 @@
 //! Some examples of handlers:
 //!
 //! ```rust
-//! use bytes::Bytes;
+//! use axum::body::Bytes;
 //! use http::StatusCode;
 //!
 //! // Handler that immediately returns an empty `200 OK` response.
@@ -71,7 +71,7 @@
 //! [axum-debug]: https://docs.rs/axum-debug
 
 use crate::{
-    body::{boxed, Body},
+    body::{boxed, Body, Bytes, HttpBody},
     extract::{
         connect_info::{Connected, IntoMakeServiceWithConnectInfo},
         FromRequest, RequestParts,
@@ -81,7 +81,6 @@ use crate::{
     BoxError,
 };
 use async_trait::async_trait;
-use bytes::Bytes;
 use http::Request;
 use std::{fmt, future::Future, marker::PhantomData};
 use tower::ServiceExt;
@@ -344,7 +343,7 @@ where
     S::Future: Send,
     T: 'static,
     ReqBody: Send + 'static,
-    ResBody: http_body::Body<Data = Bytes> + Send + 'static,
+    ResBody: HttpBody<Data = Bytes> + Send + 'static,
     ResBody::Error: Into<BoxError>,
 {
     type Sealed = sealed::Hidden;

axum/src/json.rs

@@ -1,5 +1,5 @@
 use crate::{
-    body,
+    body::{self, Bytes, Full, HttpBody},
     extract::{rejection::*, FromRequest, RequestParts},
     response::{IntoResponse, Response},
     BoxError,
@@ -9,7 +9,6 @@ use http::{
     header::{self, HeaderValue},
     StatusCode,
 };
-use http_body::Full;
 use serde::{de::DeserializeOwned, Serialize};
 use std::ops::{Deref, DerefMut};
 
@@ -90,7 +89,7 @@ pub struct Json<T>(pub T);
 impl<T, B> FromRequest<B> for Json<T>
 where
     T: DeserializeOwned,
-    B: http_body::Body + Send,
+    B: HttpBody + Send,
     B::Data: Send,
     B::Error: Into<BoxError>,
 {
@@ -98,7 +97,7 @@ where
 
     async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
         if json_content_type(req)? {
-            let bytes = bytes::Bytes::from_request(req).await?;
+            let bytes = Bytes::from_request(req).await?;
 
             let value = serde_json::from_slice(&bytes).map_err(InvalidJsonBody::from_err)?;
 

axum/src/macros.rs

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

axum/src/response/mod.rs

@@ -1,9 +1,8 @@
 #![doc = include_str!("../docs/response.md")]
 
+use crate::body::{Bytes, Full};
 use axum_core::body::boxed;
-use bytes::Bytes;
 use http::{header, HeaderValue};
-use http_body::Full;
 
 mod redirect;
 
@@ -48,11 +47,11 @@ impl<T> From<T> for Html<T> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::body::Empty;
     use http::{
         header::{HeaderMap, HeaderName},
         StatusCode,
     };
-    use http_body::Empty;
 
     #[test]
     fn test_merge_headers() {

axum/src/response/redirect.rs

@@ -1,7 +1,6 @@
 use super::{IntoResponse, Response};
-use crate::body::boxed;
+use crate::body::{boxed, Empty};
 use http::{header::LOCATION, HeaderValue, StatusCode, Uri};
-use http_body::Empty;
 use std::convert::TryFrom;
 
 /// Response that redirects the request to another location.

axum/src/response/sse.rs

@@ -28,16 +28,14 @@
 //! ```
 
 use crate::{
-    body,
+    body::{self, Bytes, HttpBody},
     response::{IntoResponse, Response},
     BoxError,
 };
-use bytes::Bytes;
 use futures_util::{
     ready,
     stream::{Stream, TryStream},
 };
-use http_body::Body as HttpBody;
 use pin_project_lite::pin_project;
 use std::{
     borrow::Cow,

axum/src/routing/method_routing.rs

@@ -1,5 +1,5 @@
 use crate::{
-    body::{boxed, Body, Bytes},
+    body::{boxed, Body, Bytes, Empty, HttpBody},
     error_handling::{HandleError, HandleErrorLayer},
     handler::Handler,
     http::{Method, Request, StatusCode},
@@ -7,7 +7,6 @@ use crate::{
     routing::{Fallback, MethodFilter, Route},
     BoxError,
 };
-use http_body::Empty;
 use std::{
     convert::Infallible,
     fmt,
@@ -78,7 +77,7 @@ macro_rules! top_level_service_fn {
         where
             S: Service<Request<ReqBody>, Response = Response<ResBody>> + Clone + Send + 'static,
             S::Future: Send + 'static,
-            ResBody: http_body::Body<Data = Bytes> + Send + 'static,
+            ResBody: HttpBody<Data = Bytes> + Send + 'static,
             ResBody::Error: Into<BoxError>,
         {
             on_service(MethodFilter::$method, svc)
@@ -213,7 +212,7 @@ macro_rules! chained_service_fn {
                 + Send
                 + 'static,
             S::Future: Send + 'static,
-            ResBody: http_body::Body<Data = Bytes> + Send + 'static,
+            ResBody: HttpBody<Data = Bytes> + Send + 'static,
             ResBody::Error: Into<BoxError>,
         {
             self.on_service(MethodFilter::$method, svc)
@@ -321,7 +320,7 @@ pub fn on_service<S, ReqBody, ResBody>(
 where
     S: Service<Request<ReqBody>, Response = Response<ResBody>> + Clone + Send + 'static,
     S::Future: Send + 'static,
-    ResBody: http_body::Body<Data = Bytes> + Send + 'static,
+    ResBody: HttpBody<Data = Bytes> + Send + 'static,
     ResBody::Error: Into<BoxError>,
 {
     MethodRouter::new().on_service(filter, svc)
@@ -384,7 +383,7 @@ pub fn any_service<S, ReqBody, ResBody>(svc: S) -> MethodRouter<ReqBody, S::Erro
 where
     S: Service<Request<ReqBody>, Response = Response<ResBody>> + Clone + Send + 'static,
     S::Future: Send + 'static,
-    ResBody: http_body::Body<Data = Bytes> + Send + 'static,
+    ResBody: HttpBody<Data = Bytes> + Send + 'static,
     ResBody::Error: Into<BoxError>,
 {
     MethodRouter::new().fallback(svc)
@@ -607,7 +606,7 @@ impl<ReqBody, E> MethodRouter<ReqBody, E> {
             + Send
             + 'static,
         S::Future: Send + 'static,
-        ResBody: http_body::Body<Data = Bytes> + Send + 'static,
+        ResBody: HttpBody<Data = Bytes> + Send + 'static,
         ResBody::Error: Into<BoxError>,
     {
         self.on_service_boxed_response_body(filter, svc.map_response(|res| res.map(boxed)))
@@ -630,7 +629,7 @@ impl<ReqBody, E> MethodRouter<ReqBody, E> {
             + Send
             + 'static,
         S::Future: Send + 'static,
-        ResBody: http_body::Body<Data = Bytes> + Send + 'static,
+        ResBody: HttpBody<Data = Bytes> + Send + 'static,
         ResBody::Error: Into<BoxError>,
     {
         self.fallback = Fallback::Custom(Route::new(svc.map_response(|res| res.map(boxed))));
@@ -658,7 +657,7 @@ impl<ReqBody, E> MethodRouter<ReqBody, E> {
             + Send
             + 'static,
         <L::Service as Service<Request<NewReqBody>>>::Future: Send + 'static,
-        NewResBody: http_body::Body<Data = Bytes> + Send + 'static,
+        NewResBody: HttpBody<Data = Bytes> + Send + 'static,
         NewResBody::Error: Into<BoxError>,
     {
         let layer = ServiceBuilder::new()
@@ -691,7 +690,7 @@ impl<ReqBody, E> MethodRouter<ReqBody, E> {
             + Send
             + 'static,
         <L::Service as Service<Request<ReqBody>>>::Future: Send + 'static,
-        NewResBody: http_body::Body<Data = Bytes> + Send + 'static,
+        NewResBody: HttpBody<Data = Bytes> + Send + 'static,
         NewResBody::Error: Into<BoxError>,
     {
         let layer = ServiceBuilder::new()

axum/src/routing/mod.rs

@@ -2,7 +2,7 @@
 
 use self::{future::RouterFuture, not_found::NotFound};
 use crate::{
-    body::{boxed, Body},
+    body::{boxed, Body, Bytes, HttpBody},
     extract::{
         connect_info::{Connected, IntoMakeServiceWithConnectInfo},
         MatchedPath, OriginalUri,
@@ -12,7 +12,6 @@ use crate::{
     util::{try_downcast, ByteStr, PercentDecodedByteStr},
     BoxError,
 };
-use bytes::Bytes;
 use http::{Request, StatusCode, Uri};
 use std::{
     borrow::Cow,
@@ -278,7 +277,7 @@ where
             + Send
             + 'static,
         <L::Service as Service<Request<NewReqBody>>>::Future: Send + 'static,
-        NewResBody: http_body::Body<Data = Bytes> + Send + 'static,
+        NewResBody: HttpBody<Data = Bytes> + Send + 'static,
         NewResBody::Error: Into<BoxError>,
     {
         let layer = ServiceBuilder::new()
@@ -319,7 +318,7 @@ where
             + Send
             + 'static,
         <L::Service as Service<Request<B>>>::Future: Send + 'static,
-        NewResBody: http_body::Body<Data = Bytes> + Send + 'static,
+        NewResBody: HttpBody<Data = Bytes> + Send + 'static,
         NewResBody::Error: Into<BoxError>,
     {
         let layer = ServiceBuilder::new()

axum/src/routing/route.rs

@@ -1,9 +1,8 @@
 use crate::{
-    body::{boxed, Body},
+    body::{boxed, Body, Empty},
     response::Response,
 };
 use http::Request;
-use http_body::Empty;
 use pin_project_lite::pin_project;
 use std::{
     convert::Infallible,

axum/src/routing/tests/merge.rs

@@ -1,5 +1,8 @@
 use super::*;
-use crate::{error_handling::HandleErrorLayer, extract::OriginalUri, response::IntoResponse, Json};
+use crate::{
+    body::HttpBody, error_handling::HandleErrorLayer, extract::OriginalUri, response::IntoResponse,
+    Json,
+};
 use serde_json::{json, Value};
 use tower::{limit::ConcurrencyLimitLayer, timeout::TimeoutLayer};
 
@@ -62,7 +65,7 @@ async fn multiple_ors_balanced_differently() {
     async fn test<S, ResBody>(name: &str, app: S)
     where
         S: Service<Request<Body>, Response = Response<ResBody>> + Clone + Send + 'static,
-        ResBody: http_body::Body + Send + 'static,
+        ResBody: HttpBody + Send + 'static,
         ResBody::Data: Send,
         ResBody::Error: Into<BoxError>,
         S::Future: Send,

axum/src/routing/tests/mod.rs

@@ -1,4 +1,5 @@
 use crate::{
+    body::{Bytes, Empty},
     error_handling::HandleErrorLayer,
     extract::{self, Path},
     handler::Handler,
@@ -7,7 +8,6 @@ use crate::{
     test_helpers::*,
     BoxError, Json, Router,
 };
-use bytes::Bytes;
 use http::{Method, Request, Response, StatusCode, Uri};
 use hyper::Body;
 use serde::Deserialize;
@@ -234,7 +234,7 @@ async fn wrong_method_service() {
     struct Svc;
 
     impl<R> Service<R> for Svc {
-        type Response = Response<http_body::Empty<Bytes>>;
+        type Response = Response<Empty<Bytes>>;
         type Error = Infallible;
         type Future = Ready<Result<Self::Response, Self::Error>>;
 
@@ -243,7 +243,7 @@ async fn wrong_method_service() {
         }
 
         fn call(&mut self, _req: R) -> Self::Future {
-            ready(Ok(Response::new(http_body::Empty::new())))
+            ready(Ok(Response::new(Empty::new())))
         }
     }
 

axum/src/test_helpers.rs

@@ -1,5 +1,6 @@
 #![allow(clippy::blacklisted_name)]
 
+use crate::body::HttpBody;
 use crate::BoxError;
 use http::{
     header::{HeaderName, HeaderValue},
@@ -28,7 +29,7 @@ impl TestClient {
     pub(crate) fn new<S, ResBody>(svc: S) -> Self
     where
         S: Service<Request<Body>, Response = http::Response<ResBody>> + Clone + Send + 'static,
-        ResBody: http_body::Body + Send + 'static,
+        ResBody: HttpBody + Send + 'static,
         ResBody::Data: Send,
         ResBody::Error: Into<BoxError>,
         S::Future: Send,

axum/src/util.rs

@@ -1,4 +1,4 @@
-use bytes::Bytes;
+use crate::body::Bytes;
 use pin_project_lite::pin_project;
 use std::fmt;
 use std::ops::Deref;