From 179608913c009e6c68c7bc04364f5e40bcb946a4 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Tue, 27 Dec 2022 19:01:11 +0100 Subject: [PATCH] Remove useless Responder::Error --- ntex/CHANGES.md | 8 ++++++++ ntex/src/web/handler.rs | 7 +++---- ntex/src/web/resource.rs | 2 -- ntex/src/web/responder.rs | 21 +-------------------- ntex/src/web/route.rs | 2 -- ntex/src/web/service.rs | 2 +- ntex/src/web/types/form.rs | 1 - ntex/src/web/types/json.rs | 1 - ntex/src/web/util.rs | 2 -- 9 files changed, 13 insertions(+), 33 deletions(-) diff --git a/ntex/CHANGES.md b/ntex/CHANGES.md index c95bb375..cc85f1e2 100644 --- a/ntex/CHANGES.md +++ b/ntex/CHANGES.md @@ -1,5 +1,13 @@ # Changes +## [0.6.0-alpha.0] - 2022-12-xx + +* Upgrade to ntex-service 0.4 + +* web: Refactor FromRequest trait, allow to borrow from request + +* web: Remove useless Responder::Error + ## [0.5.31] - 2022-11-30 * http: Don't require mutable self reference in `Response::extensions_mut()` method diff --git a/ntex/src/web/handler.rs b/ntex/src/web/handler.rs index ce3e6052..0bf9f682 100644 --- a/ntex/src/web/handler.rs +++ b/ntex/src/web/handler.rs @@ -37,10 +37,10 @@ where } pub(super) trait HandlerFn { - fn call<'a>( - &'a self, + fn call( + &self, _: WebRequest, - ) -> BoxFuture<'a, Result>; + ) -> BoxFuture<'_, Result>; } pub(super) struct HandlerWrapper { @@ -62,7 +62,6 @@ where F: Handler + 'static, T: FromRequest + 'static, T::Error: Into, - >::Error: Into, Err: ErrorRenderer, { fn call( diff --git a/ntex/src/web/resource.rs b/ntex/src/web/resource.rs index c0abca4d..365ce03c 100644 --- a/ntex/src/web/resource.rs +++ b/ntex/src/web/resource.rs @@ -13,7 +13,6 @@ use super::dev::{insert_slash, WebServiceConfig, WebServiceFactory}; use super::extract::FromRequest; use super::handler::Handler; use super::request::WebRequest; -use super::responder::Responder; use super::response::WebResponse; use super::route::{IntoRoutes, Route, RouteService}; use super::{app::Filter, error::ErrorRenderer, guard::Guard, service::AppState}; @@ -225,7 +224,6 @@ where F: Handler + 'static, Args: FromRequest + 'static, Args::Error: Into, - >::Error: Into, { self.routes.push(Route::new().to(handler)); self diff --git a/ntex/src/web/responder.rs b/ntex/src/web/responder.rs index ce620ef6..57f86db6 100644 --- a/ntex/src/web/responder.rs +++ b/ntex/src/web/responder.rs @@ -34,9 +34,6 @@ impl Future for Ready { /// /// Types that implement this trait can be used as the return type of a handler. pub trait Responder { - /// The associated error which can be returned. - type Error; - /// The future response value. type Future: Future; @@ -93,7 +90,6 @@ pub trait Responder { } impl Responder for Response { - type Error = Err::Container; type Future = Ready; #[inline] @@ -103,7 +99,6 @@ impl Responder for Response { } impl Responder for ResponseBuilder { - type Error = Err::Container; type Future = Ready; #[inline] @@ -117,7 +112,6 @@ where T: Responder, Err: ErrorRenderer, { - type Error = T::Error; type Future = Either>; fn respond_to(self, req: &HttpRequest) -> Self::Future { @@ -136,7 +130,6 @@ where E: Into, Err: ErrorRenderer, { - type Error = T::Error; type Future = Either>; fn respond_to(self, req: &HttpRequest) -> Self::Future { @@ -152,7 +145,6 @@ where T: Responder, Err: ErrorRenderer, { - type Error = T::Error; type Future = CustomResponderFut; fn respond_to(self, req: &HttpRequest) -> Self::Future { @@ -165,7 +157,6 @@ where } impl Responder for &'static str { - type Error = Err::Container; type Future = Ready; fn respond_to(self, _: &HttpRequest) -> Self::Future { @@ -178,7 +169,6 @@ impl Responder for &'static str { } impl Responder for &'static [u8] { - type Error = Err::Container; type Future = Ready; fn respond_to(self, _: &HttpRequest) -> Self::Future { @@ -191,7 +181,6 @@ impl Responder for &'static [u8] { } impl Responder for String { - type Error = Err::Container; type Future = Ready; fn respond_to(self, _: &HttpRequest) -> Self::Future { @@ -204,7 +193,6 @@ impl Responder for String { } impl<'a, Err: ErrorRenderer> Responder for &'a String { - type Error = Err::Container; type Future = Ready; fn respond_to(self, _: &HttpRequest) -> Self::Future { @@ -217,7 +205,6 @@ impl<'a, Err: ErrorRenderer> Responder for &'a String { } impl Responder for Bytes { - type Error = Err::Container; type Future = Ready; fn respond_to(self, _: &HttpRequest) -> Self::Future { @@ -230,7 +217,6 @@ impl Responder for Bytes { } impl Responder for BytesMut { - type Error = Err::Container; type Future = Ready; fn respond_to(self, _: &HttpRequest) -> Self::Future { @@ -322,7 +308,6 @@ impl, Err> CustomResponder { } impl, Err: ErrorRenderer> Responder for CustomResponder { - type Error = T::Error; type Future = CustomResponderFut; fn respond_to(self, req: &HttpRequest) -> Self::Future { @@ -390,7 +375,6 @@ where B: Responder, Err: ErrorRenderer, { - type Error = Err::Container; type Future = Either; fn respond_to(self, req: &HttpRequest) -> Self::Future { @@ -406,7 +390,6 @@ where T: std::fmt::Debug + std::fmt::Display + 'static, Err: ErrorRenderer, { - type Error = Err::Container; type Future = Ready; fn respond_to(self, req: &HttpRequest) -> Self::Future { @@ -423,9 +406,7 @@ pub(crate) mod tests { use crate::web::test::{init_service, TestRequest}; use crate::{service::Service, util::Bytes, util::BytesMut, web}; - fn responder>( - responder: T, - ) -> impl Responder { + fn responder>(responder: T) -> impl Responder { responder } diff --git a/ntex/src/web/route.rs b/ntex/src/web/route.rs index a6757e74..f8946264 100644 --- a/ntex/src/web/route.rs +++ b/ntex/src/web/route.rs @@ -9,7 +9,6 @@ use super::extract::FromRequest; use super::guard::{self, Guard}; use super::handler::{Handler, HandlerFn, HandlerWrapper}; use super::request::WebRequest; -use super::responder::Responder; use super::response::WebResponse; use super::HttpResponse; @@ -184,7 +183,6 @@ impl Route { F: Handler + 'static, Args: FromRequest + 'static, Args::Error: Into, - >::Error: Into, { self.handler = Rc::new(HandlerWrapper::new(handler)); self diff --git a/ntex/src/web/service.rs b/ntex/src/web/service.rs index 129df3de..9fe56a04 100644 --- a/ntex/src/web/service.rs +++ b/ntex/src/web/service.rs @@ -300,7 +300,7 @@ where /// WebServiceFactory implementation for a Vec #[allow(unused_parens)] -impl WebServiceFactory for Vec +impl WebServiceFactory for Vec where Err: ErrorRenderer, T: WebServiceFactory + 'static, diff --git a/ntex/src/web/types/form.rs b/ntex/src/web/types/form.rs index 861dab63..8034e10e 100644 --- a/ntex/src/web/types/form.rs +++ b/ntex/src/web/types/form.rs @@ -136,7 +136,6 @@ impl Responder for Form where Err::Container: From, { - type Error = serde_urlencoded::ser::Error; type Future = Ready; fn respond_to(self, req: &HttpRequest) -> Self::Future { diff --git a/ntex/src/web/types/json.rs b/ntex/src/web/types/json.rs index be34bee2..0d4a68a5 100644 --- a/ntex/src/web/types/json.rs +++ b/ntex/src/web/types/json.rs @@ -112,7 +112,6 @@ impl Responder for Json where Err::Container: From, { - type Error = JsonError; type Future = Ready; fn respond_to(self, req: &HttpRequest) -> Self::Future { diff --git a/ntex/src/web/util.rs b/ntex/src/web/util.rs index 2db52b16..1c1a64c0 100644 --- a/ntex/src/web/util.rs +++ b/ntex/src/web/util.rs @@ -14,7 +14,6 @@ use super::error::ErrorRenderer; use super::extract::FromRequest; use super::handler::Handler; use super::resource::Resource; -use super::responder::Responder; use super::route::Route; use super::scope::Scope; use super::server::HttpServer; @@ -229,7 +228,6 @@ where Args: FromRequest + 'static, Err: ErrorRenderer, Err::Container: From, - >::Error: Into, { Route::new().to(handler) }