🧑‍💻 Simplify service::HttpRequest to HttpRequest

README.md

@@ -36,7 +36,7 @@ impl PackageTrait for HelloWorld {
     }
 }
 
-async fn hello_world(request: service::HttpRequest) -> ResultPage<Markup, ErrorPage> {
+async fn hello_world(request: HttpRequest) -> ResultPage<Markup, ErrorPage> {
     Page::new(request)
         .with_component(Html::with(html! { h1 { "Hello World!" } }))
         .render()

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<String>,
 ) -> ResultPage<Markup, ErrorPage> {
     let name = path.into_inner();

examples/hello-world.rs

@@ -8,7 +8,7 @@ impl PackageTrait for HelloWorld {
     }
 }
 
-async fn hello_world(request: service::HttpRequest) -> ResultPage<Markup, ErrorPage> {
+async fn hello_world(request: HttpRequest) -> ResultPage<Markup, ErrorPage> {
     Page::new(request)
         .with_component(Html::with(html! { h1 { "Hello World!" } }))
         .render()

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<Markup, ErrorPage> {
+pub async fn summary(request: HttpRequest) -> ResultPage<Markup, ErrorPage> {
     let top_menu = Menu::new()
         .with_id("admin-menu-test")
         .add_item(menu::Item::label(L10n::t("package_name", &LOCALES_ADMIN)))

packages/pagetop-node/src/lib.rs

@@ -34,7 +34,7 @@ impl PackageTrait for Node {
     }
 }
 
-async fn node(request: service::HttpRequest) -> ResultPage<Markup, ErrorPage> {
+async fn node(request: HttpRequest) -> ResultPage<Markup, ErrorPage> {
     Page::new(request).with_title(L10n::n("Nodo")).render()
 }
 

packages/pagetop-user/src/lib.rs

@@ -29,7 +29,7 @@ impl PackageTrait for User {
     }
 }
 
-async fn login(request: service::HttpRequest) -> ResultPage<Markup, ErrorPage> {
+async fn login(request: HttpRequest) -> ResultPage<Markup, ErrorPage> {
     Page::new(request)
         .with_title(L10n::n("Identificación del usuario"))
         .with_component(

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<Markup, ErrorPage> {
+async fn service_not_found(request: HttpRequest) -> ResultPage<Markup, ErrorPage> {
     Err(ErrorPage::NotFound(request))
 }

src/base/package/welcome.rs

@@ -17,12 +17,12 @@ impl PackageTrait for Welcome {
     }
 }
 
-async fn home_page(request: service::HttpRequest) -> ResultPage<Markup, ErrorPage> {
+async fn home_page(request: HttpRequest) -> ResultPage<Markup, ErrorPage> {
     home(request, &LANGID_DEFAULT)
 }
 
 async fn home_lang(
-    request: service::HttpRequest,
+    request: HttpRequest,
     path: service::web::Path<String>,
 ) -> ResultPage<Markup, ErrorPage> {
     match langid_for(path.into_inner()) {
@@ -31,10 +31,7 @@ async fn home_lang(
     }
 }
 
-fn home(
+fn home(request: HttpRequest, lang: &'static LanguageIdentifier) -> ResultPage<Markup, ErrorPage> {
-    request: service::HttpRequest,
-    lang: &'static LanguageIdentifier,
-) -> ResultPage<Markup, ErrorPage> {
     Page::new(request)
         .with_title(L10n::l("welcome_title"))
         .with_context(ContextOp::LangId(lang))

src/lib.rs

@@ -40,7 +40,7 @@
 //!     }
 //! }
 //!
-//! async fn hello_world(request: service::HttpRequest) -> ResultPage<Markup, ErrorPage> {
+//! async fn hello_world(request: HttpRequest) -> ResultPage<Markup, ErrorPage> {
 //!     Page::new(request)
 //!         .with_component(Html::with(html! { h1 { "Hello World!" } }))
 //!         .render()

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;
 

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(),