From be0036438df057403b9e5b108425e0f6d3e8466f Mon Sep 17 00:00:00 2001 From: creativcoder Date: Tue, 5 Mar 2024 18:48:47 +0530 Subject: [PATCH 1/5] move Html from axum-extra to axum --- axum-extra/src/response/mod.rs | 8 -------- axum/src/response/mod.rs | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/axum-extra/src/response/mod.rs b/axum-extra/src/response/mod.rs index dda382cf02..184f691d28 100644 --- a/axum-extra/src/response/mod.rs +++ b/axum-extra/src/response/mod.rs @@ -57,14 +57,6 @@ macro_rules! mime_response { }; } -mime_response! { - /// A HTML response. - /// - /// Will automatically get `Content-Type: text/html; charset=utf-8`. - Html, - TEXT_HTML_UTF_8, -} - mime_response! { /// A JavaScript response. /// diff --git a/axum/src/response/mod.rs b/axum/src/response/mod.rs index 6cfd9b0763..27fed53291 100644 --- a/axum/src/response/mod.rs +++ b/axum/src/response/mod.rs @@ -40,15 +40,15 @@ pub struct Html(pub T); impl IntoResponse for Html where - T: Into, + T: IntoResponse, { fn into_response(self) -> Response { ( [( - header::CONTENT_TYPE, - HeaderValue::from_static(mime::TEXT_HTML_UTF_8.as_ref()), + http::header::CONTENT_TYPE, + http::HeaderValue::from_static(mime::TEXT_HTML_UTF_8.as_ref()), )], - self.0.into(), + self.0, ) .into_response() } From 954992422f85a2342b8ec9aed06a865c78e404c4 Mon Sep 17 00:00:00 2001 From: creativcoder Date: Tue, 5 Mar 2024 20:20:49 +0530 Subject: [PATCH 2/5] ci: lint --- axum/src/response/mod.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/axum/src/response/mod.rs b/axum/src/response/mod.rs index 27fed53291..3f85932222 100644 --- a/axum/src/response/mod.rs +++ b/axum/src/response/mod.rs @@ -1,8 +1,5 @@ #![doc = include_str!("../docs/response.md")] -use axum_core::body::Body; -use http::{header, HeaderValue}; - mod redirect; #[cfg(feature = "tokio")] From 87641ffbdc2b78011e46401e80a8610e7174868f Mon Sep 17 00:00:00 2001 From: creativcoder Date: Tue, 5 Mar 2024 20:40:15 +0530 Subject: [PATCH 3/5] update test output --- .../tests/debug_handler/fail/argument_not_extractor.stderr | 1 + 1 file changed, 1 insertion(+) diff --git a/axum-macros/tests/debug_handler/fail/argument_not_extractor.stderr b/axum-macros/tests/debug_handler/fail/argument_not_extractor.stderr index d946782586..eb78f12c74 100644 --- a/axum-macros/tests/debug_handler/fail/argument_not_extractor.stderr +++ b/axum-macros/tests/debug_handler/fail/argument_not_extractor.stderr @@ -15,6 +15,7 @@ error[E0277]: the trait bound `bool: FromRequestParts<()>` is not satisfied > > as FromRequestParts> + > and $N others = note: required for `bool` to implement `FromRequest<(), axum_core::extract::private::ViaParts>` note: required by a bound in `__axum_macros_check_handler_0_from_request_check` From 8d8ad459e131abbc6962fe694c935188cd527e55 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sun, 29 Sep 2024 10:54:39 +0200 Subject: [PATCH 4/5] Remove unnecessary qualification --- axum/src/response/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/axum/src/response/mod.rs b/axum/src/response/mod.rs index 3f85932222..7d378c7894 100644 --- a/axum/src/response/mod.rs +++ b/axum/src/response/mod.rs @@ -42,8 +42,8 @@ where fn into_response(self) -> Response { ( [( - http::header::CONTENT_TYPE, - http::HeaderValue::from_static(mime::TEXT_HTML_UTF_8.as_ref()), + header::CONTENT_TYPE, + HeaderValue::from_static(mime::TEXT_HTML_UTF_8.as_ref()), )], self.0, ) From 76b3537f5e9f62061d898dd7c43f440f3b25497a Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sun, 29 Sep 2024 10:55:54 +0200 Subject: [PATCH 5/5] Add back removed imports --- axum/src/response/mod.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/axum/src/response/mod.rs b/axum/src/response/mod.rs index 7d378c7894..632df5cbd3 100644 --- a/axum/src/response/mod.rs +++ b/axum/src/response/mod.rs @@ -1,5 +1,7 @@ #![doc = include_str!("../docs/response.md")] +use http::{header, HeaderValue}; + mod redirect; #[cfg(feature = "tokio")]