From aba7c4d8cefdd8574f79428381845673a0b19c81 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Wed, 28 Feb 2024 09:11:58 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Simplify=20?= =?UTF-8?q?service::HttpRequest=20to=20HttpRequest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- examples/hello-name.rs | 2 +- examples/hello-world.rs | 2 +- packages/pagetop-admin/src/summary.rs | 2 +- packages/pagetop-node/src/lib.rs | 2 +- packages/pagetop-user/src/lib.rs | 2 +- src/app.rs | 3 ++- src/base/package/welcome.rs | 9 +++------ src/lib.rs | 2 +- src/prelude.rs | 2 +- src/response/page.rs | 4 ++-- 11 files changed, 15 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index cefa51b8..fd11ad17 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ impl PackageTrait for HelloWorld { } } -async fn hello_world(request: service::HttpRequest) -> ResultPage { +async fn hello_world(request: HttpRequest) -> ResultPage { Page::new(request) .with_component(Html::with(html! { h1 { "Hello World!" } })) .render() diff --git a/examples/hello-name.rs b/examples/hello-name.rs index fba3c497..3a03e8b1 100644 --- a/examples/hello-name.rs +++ b/examples/hello-name.rs @@ -10,7 +10,7 @@ impl PackageTrait for HelloName { #[service::get("/hello/{name}")] async fn hello_name( - request: service::HttpRequest, + request: HttpRequest, path: service::web::Path, ) -> ResultPage { let name = path.into_inner(); diff --git a/examples/hello-world.rs b/examples/hello-world.rs index bc34a7ab..17c1e9d3 100644 --- a/examples/hello-world.rs +++ b/examples/hello-world.rs @@ -8,7 +8,7 @@ impl PackageTrait for HelloWorld { } } -async fn hello_world(request: service::HttpRequest) -> ResultPage { +async fn hello_world(request: HttpRequest) -> ResultPage { Page::new(request) .with_component(Html::with(html! { h1 { "Hello World!" } })) .render() diff --git a/packages/pagetop-admin/src/summary.rs b/packages/pagetop-admin/src/summary.rs index 1e2f7305..882a003a 100644 --- a/packages/pagetop-admin/src/summary.rs +++ b/packages/pagetop-admin/src/summary.rs @@ -2,7 +2,7 @@ use crate::LOCALES_ADMIN; use pagetop::prelude::*; -pub async fn summary(request: service::HttpRequest) -> ResultPage { +pub async fn summary(request: HttpRequest) -> ResultPage { let top_menu = Menu::new() .with_id("admin-menu-test") .add_item(menu::Item::label(L10n::t("package_name", &LOCALES_ADMIN))) diff --git a/packages/pagetop-node/src/lib.rs b/packages/pagetop-node/src/lib.rs index 99eff157..b05a1ffb 100644 --- a/packages/pagetop-node/src/lib.rs +++ b/packages/pagetop-node/src/lib.rs @@ -34,7 +34,7 @@ impl PackageTrait for Node { } } -async fn node(request: service::HttpRequest) -> ResultPage { +async fn node(request: HttpRequest) -> ResultPage { Page::new(request).with_title(L10n::n("Nodo")).render() } diff --git a/packages/pagetop-user/src/lib.rs b/packages/pagetop-user/src/lib.rs index aeb938e7..954a721c 100644 --- a/packages/pagetop-user/src/lib.rs +++ b/packages/pagetop-user/src/lib.rs @@ -29,7 +29,7 @@ impl PackageTrait for User { } } -async fn login(request: service::HttpRequest) -> ResultPage { +async fn login(request: HttpRequest) -> ResultPage { Page::new(request) .with_title(L10n::n("Identificación del usuario")) .with_component( diff --git a/src/app.rs b/src/app.rs index b85afd39..54982784 100644 --- a/src/app.rs +++ b/src/app.rs @@ -5,6 +5,7 @@ mod figfont; use crate::core::{package, package::PackageRef}; use crate::html::Markup; use crate::response::page::{ErrorPage, ResultPage}; +use crate::service::HttpRequest; use crate::{config, locale, service, trace, LazyStatic}; #[cfg(feature = "database")] @@ -162,6 +163,6 @@ impl Application { } } -async fn service_not_found(request: service::HttpRequest) -> ResultPage { +async fn service_not_found(request: HttpRequest) -> ResultPage { Err(ErrorPage::NotFound(request)) } diff --git a/src/base/package/welcome.rs b/src/base/package/welcome.rs index d995c74f..d6b6a009 100644 --- a/src/base/package/welcome.rs +++ b/src/base/package/welcome.rs @@ -17,12 +17,12 @@ impl PackageTrait for Welcome { } } -async fn home_page(request: service::HttpRequest) -> ResultPage { +async fn home_page(request: HttpRequest) -> ResultPage { home(request, &LANGID_DEFAULT) } async fn home_lang( - request: service::HttpRequest, + request: HttpRequest, path: service::web::Path, ) -> ResultPage { match langid_for(path.into_inner()) { @@ -31,10 +31,7 @@ async fn home_lang( } } -fn home( - request: service::HttpRequest, - lang: &'static LanguageIdentifier, -) -> ResultPage { +fn home(request: HttpRequest, lang: &'static LanguageIdentifier) -> ResultPage { Page::new(request) .with_title(L10n::l("welcome_title")) .with_context(ContextOp::LangId(lang)) diff --git a/src/lib.rs b/src/lib.rs index f959ec53..3a670ee7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -40,7 +40,7 @@ //! } //! } //! -//! async fn hello_world(request: service::HttpRequest) -> ResultPage { +//! async fn hello_world(request: HttpRequest) -> ResultPage { //! Page::new(request) //! .with_component(Html::with(html! { h1 { "Hello World!" } })) //! .render() diff --git a/src/prelude.rs b/src/prelude.rs index dcefffc5..ad9e89fc 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -40,7 +40,7 @@ pub use crate::datetime::*; pub use crate::{db, db::*, migrations, new_migration}; pub use crate::service; -pub use crate::service::HttpMessage; +pub use crate::service::{HttpMessage, HttpRequest}; pub use crate::core::AnyBase; diff --git a/src/response/page.rs b/src/response/page.rs index b79d81b8..48d47c37 100644 --- a/src/response/page.rs +++ b/src/response/page.rs @@ -11,7 +11,7 @@ use crate::fn_builder; use crate::html::{html, Markup, DOCTYPE}; use crate::html::{ClassesOp, Favicon, OptionClasses, OptionId, OptionTranslated}; use crate::locale::L10n; -use crate::{fn_with, service}; +use crate::service::HttpRequest; use unic_langid::CharacterDirection; @@ -32,7 +32,7 @@ pub struct Page { impl Page { #[rustfmt::skip] - pub fn new(request: service::HttpRequest) -> Self { + pub fn new(request: HttpRequest) -> Self { Page { title : OptionTranslated::default(), description : OptionTranslated::default(),