Skip to content

Commit 902a394

Browse files
svix-jplattejplatte
authored andcommitted
Remove useless into_response calls
Route::new applies a `map_response(into_response)` already, so the service being given to it doesn't have to involve an into_response call itself.
1 parent 0194d1d commit 902a394

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

axum/src/routing/method_routing.rs

+3-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use std::{
1919
fmt,
2020
task::{Context, Poll},
2121
};
22-
use tower::{service_fn, util::MapResponseLayer};
22+
use tower::service_fn;
2323
use tower_layer::Layer;
2424
use tower_service::Service;
2525

@@ -748,7 +748,7 @@ where
748748
/// requests.
749749
pub fn new() -> Self {
750750
let fallback = Route::new(service_fn(|_: Request| async {
751-
Ok(StatusCode::METHOD_NOT_ALLOWED.into_response())
751+
Ok(StatusCode::METHOD_NOT_ALLOWED)
752752
}));
753753

754754
Self {
@@ -1016,11 +1016,7 @@ where
10161016
);
10171017
}
10181018

1019-
let layer_fn = move |svc| {
1020-
let svc = layer.layer(svc);
1021-
let svc = MapResponseLayer::new(IntoResponse::into_response).layer(svc);
1022-
Route::new(svc)
1023-
};
1019+
let layer_fn = move |svc| Route::new(layer.layer(svc));
10241020

10251021
self.get = self.get.map(layer_fn.clone());
10261022
self.head = self.head.map(layer_fn.clone());

axum/src/routing/route.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,7 @@ impl<E> Route<E> {
6767
<L::Service as Service<Request>>::Future: Send + 'static,
6868
NewError: 'static,
6969
{
70-
let layer = (
71-
MapErrLayer::new(Into::into),
72-
MapResponseLayer::new(IntoResponse::into_response),
73-
layer,
74-
);
70+
let layer = (MapErrLayer::new(Into::into), layer);
7571

7672
Route::new(layer.layer(self))
7773
}

0 commit comments

Comments
 (0)