Skip to content

conduit-axum: Move RoutePattern insertion out of conduit_into_axum() #5781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 1, 2023
Merged

conduit-axum: Move RoutePattern insertion out of conduit_into_axum() #5781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions conduit-axum/src/fallback.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,13 @@ async fn fallback_to_conduit(
let mut request = ConduitRequest::new(request, remote_addr, now);
handler
.call(&mut request)
.map(|response| conduit_into_axum(response, request))
.map(|mut response| {
if let Some(pattern) = request.mut_extensions().remove::<RoutePattern>() {
response.extensions_mut().insert(pattern);
}

conduit_into_axum(response)
})
.unwrap_or_else(|e| server_error_response(&*e))
})
})
Expand All @@ -68,13 +74,9 @@ async fn fallback_to_conduit(
}

/// Turns a `ConduitResponse` into a `AxumResponse`
fn conduit_into_axum(mut response: ConduitResponse, mut request: ConduitRequest) -> AxumResponse {
fn conduit_into_axum(response: ConduitResponse) -> AxumResponse {
use conduit::Body::*;

if let Some(pattern) = request.mut_extensions().remove::<RoutePattern>() {
response.extensions_mut().insert(pattern);
}

let (parts, body) = response.into_parts();
match body {
Static(slice) => Response::from_parts(parts, axum::body::Body::from(slice)).into_response(),
Expand Down