diff --git a/pagetop/src/config.rs b/pagetop/src/config.rs index cd874295..99e1c60d 100644 --- a/pagetop/src/config.rs +++ b/pagetop/src/config.rs @@ -125,10 +125,11 @@ mod path; mod source; mod value; -use crate::concat_string; use crate::config::data::ConfigData; use crate::config::file::File; +use concat_string::concat_string; + use std::sync::LazyLock; use std::env; diff --git a/pagetop/src/core/component/context.rs b/pagetop/src/core/component/context.rs index e0529e61..e5d7f196 100644 --- a/pagetop/src/core/component/context.rs +++ b/pagetop/src/core/component/context.rs @@ -1,4 +1,3 @@ -use crate::concat_string; use crate::core::component::ChildOp; use crate::core::layout::all::{layout_by_short_name, DEFAULT_LAYOUT}; use crate::core::layout::{ChildrenInRegions, LayoutRef}; @@ -8,6 +7,8 @@ use crate::locale::{LanguageIdentifier, DEFAULT_LANGID}; use crate::service::HttpRequest; use crate::util::TypeInfo; +use concat_string::concat_string; + use std::collections::HashMap; use std::error::Error; use std::str::FromStr; diff --git a/pagetop/src/html/assets/javascript.rs b/pagetop/src/html/assets/javascript.rs index 76d84673..15c38c5f 100644 --- a/pagetop/src/html/assets/javascript.rs +++ b/pagetop/src/html/assets/javascript.rs @@ -1,6 +1,8 @@ use crate::html::assets::AssetsTrait; use crate::html::{html, Markup}; -use crate::{concat_string, AutoDefault, Weight}; +use crate::{AutoDefault, Weight}; + +use concat_string::concat_string; #[derive(AutoDefault)] enum Source { diff --git a/pagetop/src/html/assets/stylesheet.rs b/pagetop/src/html/assets/stylesheet.rs index 5dd65a97..09a0e96d 100644 --- a/pagetop/src/html/assets/stylesheet.rs +++ b/pagetop/src/html/assets/stylesheet.rs @@ -1,6 +1,8 @@ use crate::html::assets::AssetsTrait; use crate::html::{html, Markup, PreEscaped}; -use crate::{concat_string, AutoDefault, Weight}; +use crate::{AutoDefault, Weight}; + +use concat_string::concat_string; #[derive(AutoDefault)] enum Source { diff --git a/pagetop/src/lib.rs b/pagetop/src/lib.rs index 9f1a4aa7..0f1db2e0 100644 --- a/pagetop/src/lib.rs +++ b/pagetop/src/lib.rs @@ -83,12 +83,6 @@ // RE-EXPORTED ************************************************************************************* -// Concatena una serie de fragmentos de cadena en una cadena propia. -pub use concat_string::concat_string; - -/// Concatenación flexible de identificadores en macros. -pub use paste::paste; - pub use pagetop_macros::{fn_builder, html, main, test, AutoDefault, ComponentClasses}; pub type StaticResources = std::collections::HashMap<&'static str, static_files::Resource>; diff --git a/pagetop/src/prelude.rs b/pagetop/src/prelude.rs index 6768849d..4a6f67d7 100644 --- a/pagetop/src/prelude.rs +++ b/pagetop/src/prelude.rs @@ -2,7 +2,7 @@ // RE-EXPORTED. -pub use crate::{concat_string, fn_builder, html, main, paste, test}; +pub use crate::{fn_builder, html, main, test}; pub use crate::{AutoDefault, ComponentClasses, StaticResources, UniqueId, Weight}; diff --git a/pagetop/src/service.rs b/pagetop/src/service.rs index 26811917..fa02ba11 100644 --- a/pagetop/src/service.rs +++ b/pagetop/src/service.rs @@ -15,14 +15,14 @@ pub use actix_web_static_files::ResourceFiles; #[macro_export] macro_rules! include_files { ( $bundle:ident ) => { - $crate::paste! { + $crate::util::paste! { mod [] { include!(concat!(env!("OUT_DIR"), "/", stringify!($bundle), ".rs")); } } }; ( $STATIC:ident => $bundle:ident ) => { - $crate::paste! { + $crate::util::paste! { mod [] { include!(concat!(env!("OUT_DIR"), "/", stringify!($bundle), ".rs")); } @@ -36,7 +36,7 @@ macro_rules! include_files { #[macro_export] macro_rules! include_files_service { ( $scfg:ident, $bundle:ident => $path:expr $(, [$root:expr, $relative:expr])? ) => {{ - $crate::paste! { + $crate::util::paste! { let span = $crate::trace::debug_span!("Configuring static files ", path = $path); let _ = span.in_scope(|| { #[allow(unused_mut)] diff --git a/pagetop/src/util.rs b/pagetop/src/util.rs index abe16549..610a5e0f 100644 --- a/pagetop/src/util.rs +++ b/pagetop/src/util.rs @@ -140,6 +140,9 @@ pub fn absolute_dir( // USEFUL MACROS *********************************************************************************** +/// Flexible concatenation of identifiers in macros. +pub use paste::paste; + #[macro_export] /// Macro para construir grupos de pares clave-valor. ///