From a9132fd6c78d0cc740686d5acc89267f5fa2fc7b Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 31 Mar 2022 22:40:45 +0200 Subject: Simplify the implementation of askama_axum --- askama_axum/src/lib.rs | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'askama_axum/src/lib.rs') diff --git a/askama_axum/src/lib.rs b/askama_axum/src/lib.rs index 1048674..da3d699 100644 --- a/askama_axum/src/lib.rs +++ b/askama_axum/src/lib.rs @@ -3,26 +3,19 @@ #![deny(unreachable_pub)] pub use askama::*; -use axum_core::body; -pub use axum_core::body::BoxBody; -pub use axum_core::response::IntoResponse; -pub use http::Response; +pub use axum_core::response::{IntoResponse, Response}; use http::StatusCode; -use http_body::{Empty, Full}; -pub fn into_response(t: &T, _ext: &str) -> Response { +pub fn into_response(t: &T, _ext: &str) -> Response { match t.render() { - Ok(body) => Response::builder() - .status(StatusCode::OK) - .header( + Ok(body) => { + let headers = [( http::header::CONTENT_TYPE, http::HeaderValue::from_static(T::MIME_TYPE), - ) - .body(body::boxed(Full::from(body))) - .unwrap(), - Err(_) => Response::builder() - .status(StatusCode::INTERNAL_SERVER_ERROR) - .body(body::boxed(Empty::new())) - .unwrap(), + )]; + + (headers, body).into_response() + } + Err(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(), } } -- cgit