mirror of
https://github.com/tokio-rs/axum.git
synced 2025-04-26 13:56:22 +02:00
Remove IntoResponse
for http-body types (#1877)
This commit is contained in:
parent
d153719bef
commit
49183e404e
2 changed files with 12 additions and 60 deletions
|
@ -5,10 +5,7 @@ use http::{
|
|||
header::{self, HeaderMap, HeaderName, HeaderValue},
|
||||
Extensions, StatusCode,
|
||||
};
|
||||
use http_body::{
|
||||
combinators::{MapData, MapErr},
|
||||
Empty, Full, SizeHint,
|
||||
};
|
||||
use http_body::SizeHint;
|
||||
use std::{
|
||||
borrow::Cow,
|
||||
convert::Infallible,
|
||||
|
@ -136,7 +133,7 @@ impl IntoResponse for StatusCode {
|
|||
|
||||
impl IntoResponse for () {
|
||||
fn into_response(self) -> Response {
|
||||
Empty::new().into_response()
|
||||
Body::empty().into_response()
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -175,64 +172,12 @@ impl IntoResponse for http::response::Parts {
|
|||
}
|
||||
}
|
||||
|
||||
impl IntoResponse for Full<Bytes> {
|
||||
fn into_response(self) -> Response {
|
||||
Response::new(Body::new(self))
|
||||
}
|
||||
}
|
||||
|
||||
impl IntoResponse for Empty<Bytes> {
|
||||
fn into_response(self) -> Response {
|
||||
Response::new(Body::new(self))
|
||||
}
|
||||
}
|
||||
|
||||
impl IntoResponse for Body {
|
||||
fn into_response(self) -> Response {
|
||||
Response::new(self)
|
||||
}
|
||||
}
|
||||
|
||||
impl<E> IntoResponse for http_body::combinators::BoxBody<Bytes, E>
|
||||
where
|
||||
E: Into<BoxError> + 'static,
|
||||
{
|
||||
fn into_response(self) -> Response {
|
||||
Response::new(Body::new(self))
|
||||
}
|
||||
}
|
||||
|
||||
impl<E> IntoResponse for http_body::combinators::UnsyncBoxBody<Bytes, E>
|
||||
where
|
||||
E: Into<BoxError> + 'static,
|
||||
{
|
||||
fn into_response(self) -> Response {
|
||||
Response::new(Body::new(self))
|
||||
}
|
||||
}
|
||||
|
||||
impl<B, F> IntoResponse for MapData<B, F>
|
||||
where
|
||||
B: http_body::Body + Send + 'static,
|
||||
F: FnMut(B::Data) -> Bytes + Send + 'static,
|
||||
B::Error: Into<BoxError>,
|
||||
{
|
||||
fn into_response(self) -> Response {
|
||||
Response::new(Body::new(self))
|
||||
}
|
||||
}
|
||||
|
||||
impl<B, F, E> IntoResponse for MapErr<B, F>
|
||||
where
|
||||
B: http_body::Body<Data = Bytes> + Send + 'static,
|
||||
F: FnMut(B::Error) -> E + Send + 'static,
|
||||
E: Into<BoxError>,
|
||||
{
|
||||
fn into_response(self) -> Response {
|
||||
Response::new(Body::new(self))
|
||||
}
|
||||
}
|
||||
|
||||
impl IntoResponse for &'static str {
|
||||
fn into_response(self) -> Response {
|
||||
Cow::Borrowed(self).into_response()
|
||||
|
@ -247,7 +192,7 @@ impl IntoResponse for String {
|
|||
|
||||
impl IntoResponse for Cow<'static, str> {
|
||||
fn into_response(self) -> Response {
|
||||
let mut res = Full::from(self).into_response();
|
||||
let mut res = Body::from(self).into_response();
|
||||
res.headers_mut().insert(
|
||||
header::CONTENT_TYPE,
|
||||
HeaderValue::from_static(mime::TEXT_PLAIN_UTF_8.as_ref()),
|
||||
|
@ -258,7 +203,7 @@ impl IntoResponse for Cow<'static, str> {
|
|||
|
||||
impl IntoResponse for Bytes {
|
||||
fn into_response(self) -> Response {
|
||||
let mut res = Full::from(self).into_response();
|
||||
let mut res = Body::from(self).into_response();
|
||||
res.headers_mut().insert(
|
||||
header::CONTENT_TYPE,
|
||||
HeaderValue::from_static(mime::APPLICATION_OCTET_STREAM.as_ref()),
|
||||
|
@ -372,7 +317,7 @@ impl IntoResponse for Vec<u8> {
|
|||
|
||||
impl IntoResponse for Cow<'static, [u8]> {
|
||||
fn into_response(self) -> Response {
|
||||
let mut res = Full::from(self).into_response();
|
||||
let mut res = Body::from(self).into_response();
|
||||
res.headers_mut().insert(
|
||||
header::CONTENT_TYPE,
|
||||
HeaderValue::from_static(mime::APPLICATION_OCTET_STREAM.as_ref()),
|
||||
|
|
|
@ -37,6 +37,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
- **breaking:** Removed the `BoxBody` type alias and its `box_body`
|
||||
constructor. Use `axum::body::Body::new` instead ([#1789])
|
||||
- **breaking:** Remove `RawBody` extractor. `axum::body::Body` implements `FromRequest` directly ([#1789])
|
||||
- **breaking:** The following types from `http-body` no longer implement `IntoResponse`:
|
||||
- `Full`, use `Body::from` instead
|
||||
- `Empty`, use `Body::empty` instead
|
||||
- `BoxBody`, use `Body::new` instead
|
||||
- `UnsyncBoxBody`, use `Body::new` instead
|
||||
- `MapData`, use `Body::new` instead
|
||||
- `MapErr`, use `Body::new` instead
|
||||
- **added:** Add `axum::extract::Request` type alias where the body is `axum::body::Body` ([#1789])
|
||||
- **added:** Add `Router::as_service` and `Router::into_service` to workaround
|
||||
type inference issues when calling `ServiceExt` methods on a `Router` ([#1835])
|
||||
|
|
Loading…
Add table
Reference in a new issue