From 0d2a1b37c586ba8acf5352b7104682dac76f5df8 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Wed, 7 Jun 2023 08:47:38 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Revisa=20el=20uso=20de=20"?= =?UTF-8?q?util"=20en=20el=20c=C3=B3digo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagetop/src/core/component/definition.rs | 5 ++--- pagetop/src/core/module/definition.rs | 5 ++--- pagetop/src/prelude.rs | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pagetop/src/core/component/definition.rs b/pagetop/src/core/component/definition.rs index 868bb7f2..666cc1a0 100644 --- a/pagetop/src/core/component/definition.rs +++ b/pagetop/src/core/component/definition.rs @@ -1,7 +1,6 @@ use crate::core::component::RenderContext; use crate::html::{html, Markup}; -use crate::util::single_type_name; -use crate::{define_handle, Handle}; +use crate::{define_handle, util, Handle}; pub use std::any::Any as AnyComponent; @@ -21,7 +20,7 @@ pub trait ComponentTrait: AnyComponent + BaseComponent + Send + Sync { } fn name(&self) -> String { - single_type_name::().to_owned() + util::single_type_name::().to_owned() } fn description(&self) -> Option { diff --git a/pagetop/src/core/module/definition.rs b/pagetop/src/core/module/definition.rs index 6fbd7ae9..b6df322c 100644 --- a/pagetop/src/core/module/definition.rs +++ b/pagetop/src/core/module/definition.rs @@ -1,8 +1,7 @@ use crate::base::component::L10n; use crate::core::action::Action; use crate::core::theme::ThemeStaticRef; -use crate::util::single_type_name; -use crate::{define_handle, server, Handle}; +use crate::{define_handle, server, util, Handle}; #[cfg(feature = "database")] use crate::db::MigrationItem; @@ -59,6 +58,6 @@ pub trait ModuleTrait: BaseModule + Send + Sync { impl BaseModule for M { fn single_name(&self) -> &'static str { - single_type_name::() + util::single_type_name::() } } diff --git a/pagetop/src/prelude.rs b/pagetop/src/prelude.rs index 28b7173c..23d8ec30 100644 --- a/pagetop/src/prelude.rs +++ b/pagetop/src/prelude.rs @@ -2,10 +2,10 @@ //! **PageTop**. // Re-exports. -pub use crate::{concat_string, fn_builder, Handle, HashMapResources, LazyStatic, ResultExt}; +pub use crate::{concat_string, fn_builder, paste, Handle, HashMapResources, LazyStatic, ResultExt}; // Macros declarativas globales. -pub use crate::{args, define_config, define_handle, define_locale, paste, serve_static_files}; +pub use crate::{args, define_config, define_handle, define_locale, serve_static_files}; // Funciones Ăștiles. pub use crate::util;