From 4ac7caddd4cfd6dfee6c6cf22bfaa5951e3d8532 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sun, 23 Nov 2025 14:37:00 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=91=EF=B8=8F=20Elimina=20m=C3=A9todos?= =?UTF-8?q?=20y=20definiciones=20obsoletas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/html.rs | 58 ++------------------------------------- src/html/attr_l10n.rs | 7 ----- src/locale.rs | 6 ---- src/prelude.rs | 12 ++------ src/response/page.rs | 29 -------------------- src/service.rs | 64 ------------------------------------------- src/util.rs | 10 ------- 7 files changed, 4 insertions(+), 182 deletions(-) diff --git a/src/html.rs b/src/html.rs index 82fdcd73..d94aeea8 100644 --- a/src/html.rs +++ b/src/html.rs @@ -1,5 +1,7 @@ //! HTML en código. +use crate::AutoDefault; + mod maud; pub use maud::{display, html, html_private, Escaper, Markup, PreEscaped, DOCTYPE}; @@ -14,78 +16,22 @@ pub use assets::{Asset, Assets}; mod logo; pub use logo::PageTopSvg; -// **< HTML DOCUMENT CONTEXT >********************************************************************** - -/// **Obsoleto desde la versión 0.5.0**: usar [`core::component::Context`] en su lugar. -#[deprecated(since = "0.5.0", note = "Moved to `pagetop::core::component::Context`")] -pub type Context = crate::core::component::Context; - -/// **Obsoleto desde la versión 0.5.0**: usar [`core::component::ContextOp`] en su lugar. -#[deprecated( - since = "0.5.0", - note = "Moved to `pagetop::core::component::ContextOp`" -)] -pub type ContextOp = crate::core::component::ContextOp; - -/// **Obsoleto desde la versión 0.5.0**: usar [`core::component::Contextual`] en su lugar. -#[deprecated( - since = "0.5.0", - note = "Moved to `pagetop::core::component::Contextual`" -)] -pub trait Contextual: crate::core::component::Contextual {} - -/// **Obsoleto desde la versión 0.5.0**: usar [`core::component::ContextError`] en su lugar. -#[deprecated( - since = "0.5.0", - note = "Moved to `pagetop::core::component::ContextError`" -)] -pub type ContextError = crate::core::component::ContextError; - -/// **Obsoleto desde la versión 0.5.0**: usar [`ContextOp`] en su lugar. -#[deprecated(since = "0.5.0", note = "Use `ContextOp` instead")] -pub type AssetsOp = crate::core::component::ContextOp; - // **< HTML ATTRIBUTES >**************************************************************************** mod attr_id; pub use attr_id::AttrId; -/// **Obsoleto desde la versión 0.4.0**: usar [`AttrId`] en su lugar. -#[deprecated(since = "0.4.0", note = "Use `AttrId` instead")] -pub type OptionId = AttrId; mod attr_name; pub use attr_name::AttrName; -/// **Obsoleto desde la versión 0.4.0**: usar [`AttrName`] en su lugar. -#[deprecated(since = "0.4.0", note = "Use `AttrName` instead")] -pub type OptionName = AttrName; mod attr_value; pub use attr_value::AttrValue; -/// **Obsoleto desde la versión 0.4.0**: usar [`AttrValue`] en su lugar. -#[deprecated(since = "0.4.0", note = "Use `AttrValue` instead")] -pub type OptionString = AttrValue; mod attr_l10n; pub use attr_l10n::AttrL10n; -/// **Obsoleto desde la versión 0.4.0**: usar [`AttrL10n`] en su lugar. -#[deprecated(since = "0.4.0", note = "Use `AttrL10n` instead")] -pub type OptionTranslated = AttrL10n; mod attr_classes; pub use attr_classes::{AttrClasses, ClassesOp}; -/// **Obsoleto desde la versión 0.4.0**: usar [`AttrClasses`] en su lugar. -#[deprecated(since = "0.4.0", note = "Use `AttrClasses` instead")] -pub type OptionClasses = AttrClasses; - -use crate::{core, AutoDefault}; - -/// **Obsoleto desde la versión 0.4.0**: usar [`Typed`](crate::core::component::Typed) en su lugar. -#[deprecated( - since = "0.4.0", - note = "Use `pagetop::core::component::Typed` instead" -)] -#[allow(type_alias_bounds)] -pub type OptionComponent = core::component::Typed; mod unit; pub use unit::UnitValue; diff --git a/src/html/attr_l10n.rs b/src/html/attr_l10n.rs index 86d1c4a3..d25869c5 100644 --- a/src/html/attr_l10n.rs +++ b/src/html/attr_l10n.rs @@ -1,4 +1,3 @@ -use crate::html::Markup; use crate::locale::{L10n, LangId}; use crate::{builder_fn, AutoDefault}; @@ -58,10 +57,4 @@ impl AttrL10n { pub fn value(&self, language: &impl LangId) -> String { self.0.lookup(language).unwrap_or_default() } - - /// **Obsoleto desde la versión 0.4.0**: no recomendado para atributos HTML. - #[deprecated(since = "0.4.0", note = "For attributes use `lookup()` or `value()`")] - pub fn to_markup(&self, language: &impl LangId) -> Markup { - self.0.using(language) - } } diff --git a/src/locale.rs b/src/locale.rs index 5c000f7c..9ee87d7f 100644 --- a/src/locale.rs +++ b/src/locale.rs @@ -463,12 +463,6 @@ impl L10n { pub fn using(&self, language: &impl LangId) -> Markup { PreEscaped(self.lookup(language).unwrap_or_default()) } - - /// **Obsoleto desde la versión 0.4.0**: usar [`using()`](Self::using) en su lugar. - #[deprecated(since = "0.4.0", note = "Use `using()` instead")] - pub fn to_markup(&self, language: &impl LangId) -> Markup { - self.using(language) - } } impl fmt::Debug for L10n { diff --git a/src/prelude.rs b/src/prelude.rs index 47fbbf64..15121036 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -15,8 +15,7 @@ pub use crate::include_config; // crate::locale pub use crate::include_locales; // crate::service -#[allow(deprecated)] -pub use crate::{include_files, include_files_service, static_files_service}; +pub use crate::static_files_service; // crate::core::action pub use crate::actions_boxed; @@ -28,14 +27,7 @@ pub use crate::global; pub use crate::trace; -// No se usa `pub use crate::html::*;` para evitar duplicar alias marcados como obsoletos -// (*deprecated*) porque han sido trasladados a `crate::core::component`. Cuando se retiren estos -// alias obsoletos se volverá a declarar como `pub use crate::html::*;`. -pub use crate::html::{ - display, html_private, Asset, Assets, AttrClasses, AttrId, AttrL10n, AttrName, AttrValue, - ClassesOp, Escaper, Favicon, JavaScript, Markup, PageTopSvg, PreEscaped, PrepareMarkup, - StyleSheet, TargetMedia, UnitValue, DOCTYPE, -}; +pub use crate::html::*; pub use crate::locale::*; diff --git a/src/response/page.rs b/src/response/page.rs index 7d7789d4..b5516b8a 100644 --- a/src/response/page.rs +++ b/src/response/page.rs @@ -95,19 +95,6 @@ impl Page { self } - /// **Obsoleto desde la versión 0.4.0**: usar [`add_child()`](Self::add_child) en su lugar. - #[deprecated(since = "0.4.0", note = "Use `add_child()` instead")] - pub fn with_component(self, component: impl Component) -> Self { - self.add_child(component) - } - - /// **Obsoleto desde la versión 0.4.0**: usar [`add_child_in()`](Self::add_child_in) en su - /// lugar. - #[deprecated(since = "0.4.0", note = "Use `add_child_in()` instead")] - pub fn with_component_in(self, region_key: &'static str, component: impl Component) -> Self { - self.add_child_in(region_key, component) - } - /// Añade un componente hijo a la región de contenido por defecto. pub fn add_child(mut self, component: impl Component) -> Self { self.context @@ -122,22 +109,6 @@ impl Page { self } - /// **Obsoleto desde la versión 0.4.0**: usar [`with_child_in()`](Self::with_child_in) en su - /// lugar. - #[deprecated(since = "0.4.0", note = "Use `with_child_in()` instead")] - pub fn with_child_in_region(mut self, region_key: &'static str, op: ChildOp) -> Self { - self.alter_child_in(region_key, op); - self - } - - /// **Obsoleto desde la versión 0.4.0**: usar [`alter_child_in()`](Self::alter_child_in) en su - /// lugar. - #[deprecated(since = "0.4.0", note = "Use `alter_child_in()` instead")] - pub fn alter_child_in_region(&mut self, region_key: &'static str, op: ChildOp) -> &mut Self { - self.alter_child_in(region_key, op); - self - } - // **< Page GETTERS >*************************************************************************** /// Devuelve el título traducido para el idioma de la página, si existe. diff --git a/src/service.rs b/src/service.rs index 1b2f766c..cb69d76a 100644 --- a/src/service.rs +++ b/src/service.rs @@ -15,70 +15,6 @@ pub use pagetop_statics::ResourceFiles; #[doc(hidden)] pub use actix_web::test; -/// **Obsoleto desde la versión 0.3.0**: usar [`static_files_service!`](crate::static_files_service) -/// en su lugar. -#[deprecated(since = "0.3.0", note = "Use `static_files_service!` instead")] -#[macro_export] -macro_rules! include_files { - // Forma 1: incluye un conjunto de recursos por nombre. - ( $bundle:ident ) => { - $crate::util::paste! { - mod [] { - include!(concat!(env!("OUT_DIR"), "/", stringify!($bundle), ".rs")); - } - } - }; - // Forma 2: asigna a una variable estática $STATIC un conjunto de recursos. - ( $STATIC:ident => $bundle:ident ) => { - $crate::util::paste! { - mod [] { - include!(concat!(env!("OUT_DIR"), "/", stringify!($bundle), ".rs")); - } - pub static $STATIC: std::sync::LazyLock<$crate::StaticResources> = - std::sync::LazyLock::new( - $crate::StaticResources::new([]::$bundle) - ); - } - }; -} - -/// **Obsoleto desde la versión 0.3.0**: usar [`static_files_service!`](crate::static_files_service) -/// en su lugar. -#[deprecated(since = "0.3.0", note = "Use `static_files_service!` instead")] -#[macro_export] -macro_rules! include_files_service { - ( $scfg:ident, $bundle:ident => $route:expr $(, [$root:expr, $relative:expr])? ) => {{ - $crate::util::paste! { - let span = $crate::trace::debug_span!("Configuring static files ", path = $route); - let _ = span.in_scope(|| { - // Determina si se sirven recursos embebidos (`true`) o desde disco (`false`). - #[allow(unused_mut)] - let mut serve_embedded:bool = true; - $( - // Si `$root` y `$relative` no están vacíos, se comprueba la ruta absoluta. - if !$root.is_empty() && !$relative.is_empty() { - if let Ok(absolute) = $crate::util::absolute_dir($root, $relative) { - // Servimos directamente desde el sistema de ficheros. - $scfg.service($crate::service::ActixFiles::new( - $route, - absolute, - ).show_files_listing()); - serve_embedded = false - } - } - )? - // Si no se localiza el directorio, se exponen entonces los recursos embebidos. - if serve_embedded { - $scfg.service($crate::service::ResourceFiles::new( - $route, - []::$bundle(), - )); - } - }); - } - }}; -} - /// Configura un servicio web para publicar archivos estáticos. /// /// La macro ofrece tres modos para configurar el servicio: diff --git a/src/util.rs b/src/util.rs index 30b994f2..bfb50ec0 100644 --- a/src/util.rs +++ b/src/util.rs @@ -167,13 +167,3 @@ pub fn resolve_absolute_dir>(path: P) -> io::Result { }) } } - -/// **Obsoleto desde la versión 0.3.0**: usar [`resolve_absolute_dir()`] en su lugar. -#[deprecated(since = "0.3.0", note = "Use `resolve_absolute_dir()` instead")] -pub fn absolute_dir(root_path: P, relative_path: Q) -> io::Result -where - P: AsRef, - Q: AsRef, -{ - resolve_absolute_dir(root_path.as_ref().join(relative_path.as_ref())) -}