From 7553ed35ecd6f3f48bbac218c9e018c40d2f6100 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sat, 30 May 2026 22:50:40 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Aplica=20formato=20Rust=202024?= =?UTF-8?q?=20(`rustfmt.toml`)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extensions/pagetop-bootsier/src/theme/classes/layout.rs | 2 +- .../pagetop-bootsier/src/theme/dropdown/component.rs | 2 +- extensions/pagetop-bootsier/src/theme/form/checkbox.rs | 2 +- extensions/pagetop-bootsier/src/theme/form/input.rs | 2 +- extensions/pagetop-bootsier/src/theme/form/select.rs | 2 +- extensions/pagetop-bootsier/src/theme/form/textarea.rs | 2 +- extensions/pagetop-bootsier/src/theme/nav/item.rs | 2 +- extensions/pagetop-bootsier/src/theme/navbar/component.rs | 2 +- .../pagetop-bootsier/src/theme/offcanvas/component.rs | 2 +- helpers/pagetop-statics/build.rs | 2 +- helpers/pagetop-statics/src/resource_dir.rs | 2 +- helpers/pagetop-statics/src/sets.rs | 4 ++-- rustfmt.toml | 8 ++++++++ src/core/action/list.rs | 6 +++--- src/core/component/children.rs | 4 ++-- src/core/component/context.rs | 8 ++++---- src/core/component/definition.rs | 2 +- src/core/component/error.rs | 2 +- src/core/theme.rs | 4 ++-- src/core/theme/definition.rs | 4 ++-- src/core/theme/regions.rs | 2 +- src/html/assets.rs | 2 +- src/html/assets/favicon.rs | 2 +- src/html/assets/javascript.rs | 4 ++-- src/html/assets/stylesheet.rs | 4 ++-- src/html/attr.rs | 2 +- src/html/classes.rs | 2 +- src/html/logo.rs | 6 +++--- src/locale/definition.rs | 2 +- src/locale/l10n.rs | 2 +- src/locale/languages.rs | 2 +- 31 files changed, 51 insertions(+), 43 deletions(-) create mode 100644 rustfmt.toml diff --git a/extensions/pagetop-bootsier/src/theme/classes/layout.rs b/extensions/pagetop-bootsier/src/theme/classes/layout.rs index ee403a88..1438b210 100644 --- a/extensions/pagetop-bootsier/src/theme/classes/layout.rs +++ b/extensions/pagetop-bootsier/src/theme/classes/layout.rs @@ -1,7 +1,7 @@ use pagetop::prelude::*; -use crate::theme::attrs::{ScaleSize, Side}; use crate::theme::BreakPoint; +use crate::theme::attrs::{ScaleSize, Side}; // **< Margin >************************************************************************************* diff --git a/extensions/pagetop-bootsier/src/theme/dropdown/component.rs b/extensions/pagetop-bootsier/src/theme/dropdown/component.rs index ca15c635..b70fed65 100644 --- a/extensions/pagetop-bootsier/src/theme/dropdown/component.rs +++ b/extensions/pagetop-bootsier/src/theme/dropdown/component.rs @@ -1,7 +1,7 @@ use pagetop::prelude::*; -use crate::theme::*; use crate::LOCALES_BOOTSIER; +use crate::theme::*; /// Componente para crear un **menú desplegable** ([`dropdown`]). /// diff --git a/extensions/pagetop-bootsier/src/theme/form/checkbox.rs b/extensions/pagetop-bootsier/src/theme/form/checkbox.rs index 60d7120d..18ab908f 100644 --- a/extensions/pagetop-bootsier/src/theme/form/checkbox.rs +++ b/extensions/pagetop-bootsier/src/theme/form/checkbox.rs @@ -1,7 +1,7 @@ use pagetop::prelude::*; -use crate::theme::form; use crate::LOCALES_BOOTSIER; +use crate::theme::form; /// Componente para crear una **casilla de verificación** o un **interruptor** (*toggle switch*). /// diff --git a/extensions/pagetop-bootsier/src/theme/form/input.rs b/extensions/pagetop-bootsier/src/theme/form/input.rs index 997b7c45..68cce931 100644 --- a/extensions/pagetop-bootsier/src/theme/form/input.rs +++ b/extensions/pagetop-bootsier/src/theme/form/input.rs @@ -2,8 +2,8 @@ use pagetop::prelude::*; -use crate::theme::form; use crate::LOCALES_BOOTSIER; +use crate::theme::form; use std::fmt; diff --git a/extensions/pagetop-bootsier/src/theme/form/select.rs b/extensions/pagetop-bootsier/src/theme/form/select.rs index 92736586..7d51e9c9 100644 --- a/extensions/pagetop-bootsier/src/theme/form/select.rs +++ b/extensions/pagetop-bootsier/src/theme/form/select.rs @@ -2,8 +2,8 @@ use pagetop::prelude::*; -use crate::theme::form; use crate::LOCALES_BOOTSIER; +use crate::theme::form; // **< Item >*************************************************************************************** diff --git a/extensions/pagetop-bootsier/src/theme/form/textarea.rs b/extensions/pagetop-bootsier/src/theme/form/textarea.rs index 781e1d09..81b32783 100644 --- a/extensions/pagetop-bootsier/src/theme/form/textarea.rs +++ b/extensions/pagetop-bootsier/src/theme/form/textarea.rs @@ -1,7 +1,7 @@ use pagetop::prelude::*; -use crate::theme::form; use crate::LOCALES_BOOTSIER; +use crate::theme::form; /// Componente para crear un **área de texto** de formulario. /// diff --git a/extensions/pagetop-bootsier/src/theme/nav/item.rs b/extensions/pagetop-bootsier/src/theme/nav/item.rs index ef5a6fe9..43386baf 100644 --- a/extensions/pagetop-bootsier/src/theme/nav/item.rs +++ b/extensions/pagetop-bootsier/src/theme/nav/item.rs @@ -1,7 +1,7 @@ use pagetop::prelude::*; -use crate::theme::*; use crate::LOCALES_BOOTSIER; +use crate::theme::*; // **< ItemKind >*********************************************************************************** diff --git a/extensions/pagetop-bootsier/src/theme/navbar/component.rs b/extensions/pagetop-bootsier/src/theme/navbar/component.rs index ccd97e90..096ec87a 100644 --- a/extensions/pagetop-bootsier/src/theme/navbar/component.rs +++ b/extensions/pagetop-bootsier/src/theme/navbar/component.rs @@ -1,7 +1,7 @@ use pagetop::prelude::*; -use crate::theme::*; use crate::LOCALES_BOOTSIER; +use crate::theme::*; const TOGGLE_COLLAPSE: &str = "collapse"; const TOGGLE_OFFCANVAS: &str = "offcanvas"; diff --git a/extensions/pagetop-bootsier/src/theme/offcanvas/component.rs b/extensions/pagetop-bootsier/src/theme/offcanvas/component.rs index 764627e4..a2c014b8 100644 --- a/extensions/pagetop-bootsier/src/theme/offcanvas/component.rs +++ b/extensions/pagetop-bootsier/src/theme/offcanvas/component.rs @@ -1,7 +1,7 @@ use pagetop::prelude::*; -use crate::theme::*; use crate::LOCALES_BOOTSIER; +use crate::theme::*; /// Componente para crear un **panel lateral deslizante** ([`offcanvas`]). /// diff --git a/helpers/pagetop-statics/build.rs b/helpers/pagetop-statics/build.rs index fcd009c9..3cbd6706 100644 --- a/helpers/pagetop-statics/build.rs +++ b/helpers/pagetop-statics/build.rs @@ -13,7 +13,7 @@ use resource_dir::resource_dir; mod sets { include!("src/sets.rs"); } -use sets::{generate_resources_sets, SplitByCount}; +use sets::{SplitByCount, generate_resources_sets}; use std::{env, path::Path}; diff --git a/helpers/pagetop-statics/src/resource_dir.rs b/helpers/pagetop-statics/src/resource_dir.rs index 805e1ed4..41c29829 100644 --- a/helpers/pagetop-statics/src/resource_dir.rs +++ b/helpers/pagetop-statics/src/resource_dir.rs @@ -1,4 +1,4 @@ -use super::sets::{generate_resources_sets, SplitByCount}; +use super::sets::{SplitByCount, generate_resources_sets}; use std::{ env, io, path::{Path, PathBuf}, diff --git a/helpers/pagetop-statics/src/sets.rs b/helpers/pagetop-statics/src/sets.rs index 1d9299df..5e09f1ff 100644 --- a/helpers/pagetop-statics/src/sets.rs +++ b/helpers/pagetop-statics/src/sets.rs @@ -5,8 +5,8 @@ use std::{ }; use super::resource::{ - collect_resources, generate_function_end, generate_function_header, generate_resource_insert, - generate_uses, generate_variable_header, generate_variable_return, DEFAULT_VARIABLE_NAME, + DEFAULT_VARIABLE_NAME, collect_resources, generate_function_end, generate_function_header, + generate_resource_insert, generate_uses, generate_variable_header, generate_variable_return, }; /// Defines the split strategie. diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 00000000..5d6e629c --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,8 @@ +edition = "2024" +max_width = 100 +hard_tabs = false +tab_spaces = 4 +newline_style = "Auto" + +# Heurísticas por defecto: evitar reformateo agresivo +use_small_heuristics = "Default" diff --git a/src/core/action/list.rs b/src/core/action/list.rs index d60129c1..f47d3d6e 100644 --- a/src/core/action/list.rs +++ b/src/core/action/list.rs @@ -1,7 +1,7 @@ -use crate::core::action::{ActionBox, ActionDispatcher}; -use crate::core::AnyCast; -use crate::trace; use crate::AutoDefault; +use crate::core::AnyCast; +use crate::core::action::{ActionBox, ActionDispatcher}; +use crate::trace; use parking_lot::RwLock; diff --git a/src/core/component/children.rs b/src/core/component/children.rs index 617a783d..bfedec14 100644 --- a/src/core/component/children.rs +++ b/src/core/component/children.rs @@ -1,6 +1,6 @@ use crate::core::component::{Component, Context}; -use crate::html::{html, Markup}; -use crate::{builder_fn, AutoDefault, UniqueId}; +use crate::html::{Markup, html}; +use crate::{AutoDefault, UniqueId, builder_fn}; use parking_lot::Mutex; diff --git a/src/core/component/context.rs b/src/core/component/context.rs index 63b2daad..9ff7251c 100644 --- a/src/core/component/context.rs +++ b/src/core/component/context.rs @@ -1,13 +1,13 @@ +use crate::core::TypeInfo; use crate::core::component::{ChildOp, Component, MessageLevel, StatusMessage}; use crate::core::theme::all::DEFAULT_THEME; use crate::core::theme::{ChildrenInRegions, DefaultRegion, RegionRef, TemplateRef, ThemeRef}; -use crate::core::TypeInfo; -use crate::html::{html, Markup, RoutePath}; use crate::html::{Assets, Favicon, JavaScript, StyleSheet}; +use crate::html::{Markup, RoutePath, html}; use crate::locale::L10n; use crate::locale::{LangId, LanguageIdentifier, RequestLocale}; -use crate::service::HttpRequest; -use crate::{builder_fn, util, CowStr}; +use crate::web::HttpRequest; +use crate::{CowStr, builder_fn, util}; use std::any::Any; use std::cell::Cell; diff --git a/src/core/component/definition.rs b/src/core/component/definition.rs index 718e3b37..b7ceaa9a 100644 --- a/src/core/component/definition.rs +++ b/src/core/component/definition.rs @@ -2,7 +2,7 @@ use crate::base::action; use crate::core::component::{ComponentError, Context, Contextual}; use crate::core::theme::ThemeRef; use crate::core::{AnyInfo, TypeInfo}; -use crate::html::{html, Markup}; +use crate::html::{Markup, html}; /// Permite clonar un componente. /// diff --git a/src/core/component/error.rs b/src/core/component/error.rs index beb7c8f2..86f9e4aa 100644 --- a/src/core/component/error.rs +++ b/src/core/component/error.rs @@ -1,4 +1,4 @@ -use crate::html::{html, Markup}; +use crate::html::{Markup, html}; use crate::{AutoDefault, Getters}; /// Error producido durante el renderizado de un componente. diff --git a/src/core/theme.rs b/src/core/theme.rs index a8c1f3a4..43649db1 100644 --- a/src/core/theme.rs +++ b/src/core/theme.rs @@ -28,9 +28,9 @@ //! mediante *enums* adicionales) para añadir nuevas plantillas o exponer regiones específicas. use crate::core::component::Context; -use crate::html::{html, Markup}; +use crate::html::{Markup, html}; use crate::locale::L10n; -use crate::{util, AutoDefault}; +use crate::{AutoDefault, util}; // **< Region >************************************************************************************* diff --git a/src/core/theme/definition.rs b/src/core/theme/definition.rs index 17f3b391..0b036dd4 100644 --- a/src/core/theme/definition.rs +++ b/src/core/theme/definition.rs @@ -3,10 +3,10 @@ use crate::core::component::{ChildOp, Component, ComponentError, Context, Contex use crate::core::extension::Extension; use crate::core::theme::{DefaultRegion, DefaultTemplate, TemplateRef}; use crate::global; -use crate::html::{html, Markup}; +use crate::html::{Markup, html}; use crate::locale::L10n; use crate::response::page::Page; -use crate::service::http::StatusCode; +use crate::web::http::StatusCode; /// Interfaz común que debe implementar cualquier tema de PageTop. /// diff --git a/src/core/theme/regions.rs b/src/core/theme/regions.rs index a2b71ff2..a10e3ecc 100644 --- a/src/core/theme/regions.rs +++ b/src/core/theme/regions.rs @@ -1,6 +1,6 @@ use crate::core::component::{Child, ChildOp, Children, Component}; use crate::core::theme::{DefaultRegion, RegionRef, ThemeRef}; -use crate::{builder_fn, AutoDefault, UniqueId}; +use crate::{AutoDefault, UniqueId, builder_fn}; use parking_lot::RwLock; diff --git a/src/html/assets.rs b/src/html/assets.rs index fe5f5b7c..80cb3b26 100644 --- a/src/html/assets.rs +++ b/src/html/assets.rs @@ -3,7 +3,7 @@ pub mod javascript; pub mod stylesheet; use crate::core::component::Context; -use crate::html::{html, Markup}; +use crate::html::{Markup, html}; use crate::{AutoDefault, Weight}; /// Representación genérica de un script [`JavaScript`](crate::html::JavaScript) o una hoja de diff --git a/src/html/assets/favicon.rs b/src/html/assets/favicon.rs index 1a4174bf..2a4f26ed 100644 --- a/src/html/assets/favicon.rs +++ b/src/html/assets/favicon.rs @@ -1,5 +1,5 @@ use crate::core::component::Context; -use crate::html::{html, Markup}; +use crate::html::{Markup, html}; use crate::{AutoDefault, CowStr}; /// Un **Favicon** es un recurso gráfico que usa el navegador como icono asociado al sitio. diff --git a/src/html/assets/javascript.rs b/src/html/assets/javascript.rs index 62126895..e348bebc 100644 --- a/src/html/assets/javascript.rs +++ b/src/html/assets/javascript.rs @@ -1,7 +1,7 @@ use crate::core::component::Context; use crate::html::assets::Asset; -use crate::html::{html, Markup, PreEscaped}; -use crate::{util, AutoDefault, CowStr, Weight}; +use crate::html::{Markup, PreEscaped, html}; +use crate::{AutoDefault, CowStr, Weight, util}; /// Define el origen del recurso JavaScript y cómo debe cargarse en el navegador. /// diff --git a/src/html/assets/stylesheet.rs b/src/html/assets/stylesheet.rs index 5a6d98c5..5941db9d 100644 --- a/src/html/assets/stylesheet.rs +++ b/src/html/assets/stylesheet.rs @@ -1,7 +1,7 @@ use crate::core::component::Context; use crate::html::assets::Asset; -use crate::html::{html, Markup, PreEscaped}; -use crate::{util, AutoDefault, CowStr, Weight}; +use crate::html::{Markup, PreEscaped, html}; +use crate::{AutoDefault, CowStr, Weight, util}; /// Define el origen del recurso CSS y cómo se incluye en el documento. /// diff --git a/src/html/attr.rs b/src/html/attr.rs index 61f7252c..8f25a5eb 100644 --- a/src/html/attr.rs +++ b/src/html/attr.rs @@ -1,5 +1,5 @@ use crate::locale::{L10n, LangId}; -use crate::{builder_fn, AutoDefault}; +use crate::{AutoDefault, builder_fn}; /// Valor opcional para atributos HTML. /// diff --git a/src/html/classes.rs b/src/html/classes.rs index 3465d6b3..2f665c19 100644 --- a/src/html/classes.rs +++ b/src/html/classes.rs @@ -1,4 +1,4 @@ -use crate::{builder_fn, util, AutoDefault, CowStr}; +use crate::{AutoDefault, CowStr, builder_fn, util}; use std::collections::HashSet; diff --git a/src/html/logo.rs b/src/html/logo.rs index d5dcaa0b..7746da7a 100644 --- a/src/html/logo.rs +++ b/src/html/logo.rs @@ -1,7 +1,7 @@ -use crate::core::component::Context; -use crate::html::{html, Markup}; -use crate::locale::L10n; use crate::AutoDefault; +use crate::core::component::Context; +use crate::html::{Markup, html}; +use crate::locale::L10n; /// Representación SVG del **logotipo de PageTop** para incrustar en HTML. /// diff --git a/src/locale/definition.rs b/src/locale/definition.rs index 06a07c49..bffc805c 100644 --- a/src/locale/definition.rs +++ b/src/locale/definition.rs @@ -1,7 +1,7 @@ use crate::{global, trace}; use super::languages::LANGUAGES; -use super::{langid, LanguageIdentifier}; +use super::{LanguageIdentifier, langid}; use std::sync::LazyLock; diff --git a/src/locale/l10n.rs b/src/locale/l10n.rs index af5e9535..e75e103d 100644 --- a/src/locale/l10n.rs +++ b/src/locale/l10n.rs @@ -1,5 +1,5 @@ use crate::html::{Markup, PreEscaped}; -use crate::{include_locales, AutoDefault, CowStr}; +use crate::{AutoDefault, CowStr, include_locales}; use super::{LangId, Locale}; diff --git a/src/locale/languages.rs b/src/locale/languages.rs index f1962a14..cda4483d 100644 --- a/src/locale/languages.rs +++ b/src/locale/languages.rs @@ -1,6 +1,6 @@ use crate::util; -use super::{langid, LanguageIdentifier}; +use super::{LanguageIdentifier, langid}; use std::collections::HashMap; use std::sync::LazyLock;