From fea6c2f69e18da906847c286763a0cd538c37e29 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sat, 27 Jul 2024 14:17:45 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20alter=5F...(...)=20func?= =?UTF-8?q?tions=20to=20set=5F...(...)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- helpers/pagetop-macros/src/lib.rs | 74 +++++++++++++------ .../component/after_prepare_component.rs | 2 +- .../component/before_prepare_component.rs | 2 +- src/base/action/component/is_renderable.rs | 2 +- src/base/component.rs | 14 ++-- src/base/component/basic/fluent.rs | 2 +- src/base/component/basic/html.rs | 2 +- src/base/component/block.rs | 18 ++--- src/base/component/branding.rs | 16 ++-- src/base/component/button.rs | 36 ++++----- src/base/component/flex/container.rs | 22 +++--- src/base/component/flex/item.rs | 22 +++--- src/base/component/form/action_button.rs | 38 +++++----- src/base/component/form/date.rs | 59 ++++++--------- src/base/component/form/form_main.rs | 20 ++--- src/base/component/form/hidden.rs | 8 +- src/base/component/form/input.rs | 69 ++++++++--------- src/base/component/heading.rs | 14 ++-- src/base/component/icon.rs | 10 +-- src/base/component/image.rs | 10 +-- src/base/component/menu/group.rs | 10 +-- src/base/component/menu/item.rs | 12 +-- src/base/component/menu/megamenu.rs | 10 +-- src/base/component/menu/menu_main.rs | 10 +-- src/base/component/menu/submenu.rs | 14 ++-- src/base/component/paragraph.rs | 14 ++-- src/base/component/powered_by.rs | 8 +- src/base/theme/basic.rs | 8 +- src/base/theme/chassis.rs | 8 +- src/base/theme/inception.rs | 8 +- src/core/component/classes.rs | 4 +- src/core/component/context.rs | 6 +- src/core/component/mixed.rs | 8 +- src/core/theme/definition.rs | 2 +- src/core/theme/regions.rs | 10 +-- src/html/opt_classes.rs | 2 +- src/html/opt_component.rs | 2 +- src/html/opt_id.rs | 2 +- src/html/opt_name.rs | 2 +- src/html/opt_string.rs | 2 +- src/html/opt_translated.rs | 2 +- src/response/page.rs | 42 +++++------ 42 files changed, 314 insertions(+), 312 deletions(-) diff --git a/helpers/pagetop-macros/src/lib.rs b/helpers/pagetop-macros/src/lib.rs index e3378a90..8c6ac065 100644 --- a/helpers/pagetop-macros/src/lib.rs +++ b/helpers/pagetop-macros/src/lib.rs @@ -13,28 +13,54 @@ pub fn html(input: TokenStream) -> TokenStream { maud::expand(input.into()).into() } +/// Macro attribute to generate builder methods from `set_` methods. +/// +/// This macro takes a method with the `set_` prefix and generates a corresponding method with the +/// `with_` prefix to use in the builder pattern. +/// +/// # Panics +/// +/// This function will panic if a parameter identifier is not found in the argument list. +/// +/// # Examples +/// +/// ``` +/// #[fn_builder] +/// pub fn set_example(&mut self) -> &mut Self { +/// // implementation +/// } +/// ``` +/// +/// Will generate: +/// +/// ``` +/// pub fn with_example(mut self) -> Self { +/// self.set_example(); +/// self +/// } +/// ``` #[proc_macro_attribute] pub fn fn_builder(_: TokenStream, item: TokenStream) -> TokenStream { - let fn_alter = parse_macro_input!(item as ItemFn); - let fn_alter_name = fn_alter.sig.ident.to_string(); + let fn_set = parse_macro_input!(item as ItemFn); + let fn_set_name = fn_set.sig.ident.to_string(); - if !fn_alter_name.starts_with("alter_") { + if !fn_set_name.starts_with("set_") { let expanded = quote_spanned! { - fn_alter.sig.ident.span() => - compile_error!("expected a \"pub fn alter_...() -> &mut Self\" method"); + fn_set.sig.ident.span() => + compile_error!("expected a \"pub fn set_...() -> &mut Self\" method"); }; return expanded.into(); } - let fn_with_name = fn_alter_name.replace("alter_", "with_"); - let fn_with_generics = if fn_alter.sig.generics.params.is_empty() { - fn_with_name.to_owned() + let fn_with_name = fn_set_name.replace("set_", "with_"); + let fn_with_generics = if fn_set.sig.generics.params.is_empty() { + fn_with_name.clone() } else { - let g = &fn_alter.sig.generics; + let g = &fn_set.sig.generics; concat_string!(fn_with_name, quote! { #g }.to_string()) }; - let where_clause = fn_alter + let where_clause = fn_set .sig .generics .where_clause @@ -43,7 +69,7 @@ pub fn fn_builder(_: TokenStream, item: TokenStream) -> TokenStream { concat_string!(quote! { #where_clause }.to_string(), " ") }); - let args: Vec = fn_alter + let args: Vec = fn_set .sig .inputs .iter() @@ -65,17 +91,17 @@ pub fn fn_builder(_: TokenStream, item: TokenStream) -> TokenStream { #[rustfmt::skip] let fn_with = parse_str::(concat_string!(" pub fn ", fn_with_generics, "(mut self, ", args.join(", "), ") -> Self ", where_clause, "{ - self.", fn_alter_name, "(", params.join(", "), "); + self.", fn_set_name, "(", params.join(", "), "); self } ").as_str()).unwrap(); #[rustfmt::skip] - let fn_alter_doc = concat_string!( - "

", - "Use ", + let fn_set_doc = concat_string!( + "

Use ", + "pub fn ", fn_with_name, - "(self, …) -> Self to apply the builder pattern.", + "(self, …) -> Self for the builder pattern.", "

" ); @@ -83,13 +109,13 @@ pub fn fn_builder(_: TokenStream, item: TokenStream) -> TokenStream { #[doc(hidden)] #fn_with #[inline] - #[doc = #fn_alter_doc] - #fn_alter + #[doc = #fn_set_doc] + #fn_set }; expanded.into() } -/// Marks async main function as the PageTop entry-point. +/// Marks async main function as the `PageTop` entry-point. /// /// # Examples /// ``` @@ -109,7 +135,7 @@ pub fn main(_: TokenStream, item: TokenStream) -> TokenStream { output } -/// Marks async test functions to use the PageTop entry-point. +/// Marks async test functions to use the `PageTop` entry-point. /// /// # Examples /// ``` @@ -143,7 +169,7 @@ pub fn derive_component_classes(input: TokenStream) -> TokenStream { let input = parse_macro_input!(input as DeriveInput); let name = &input.ident; - let fn_alter_doc = concat_string!( + let fn_set_doc = concat_string!( "

", "Use ", " with_classes(self, …) -> Self ", @@ -154,9 +180,9 @@ pub fn derive_component_classes(input: TokenStream) -> TokenStream { let expanded = quote! { impl ComponentClasses for #name { #[inline] - #[doc = #fn_alter_doc] - fn alter_classes(&mut self, op: ClassesOp, classes: impl Into) -> &mut Self { - self.classes.alter_value(op, classes); + #[doc = #fn_set_doc] + fn set_classes(&mut self, op: ClassesOp, classes: impl Into) -> &mut Self { + self.classes.set_value(op, classes); self } diff --git a/src/base/action/component/after_prepare_component.rs b/src/base/action/component/after_prepare_component.rs index 150669b1..813c3c09 100644 --- a/src/base/action/component/after_prepare_component.rs +++ b/src/base/action/component/after_prepare_component.rs @@ -34,7 +34,7 @@ impl AfterPrepare { } pub fn filter_by_referer_id(mut self, id: impl Into) -> Self { - self.referer_id.alter_value(id); + self.referer_id.set_value(id); self } diff --git a/src/base/action/component/before_prepare_component.rs b/src/base/action/component/before_prepare_component.rs index 75421129..206f1177 100644 --- a/src/base/action/component/before_prepare_component.rs +++ b/src/base/action/component/before_prepare_component.rs @@ -34,7 +34,7 @@ impl BeforePrepare { } pub fn filter_by_referer_id(mut self, id: impl Into) -> Self { - self.referer_id.alter_value(id); + self.referer_id.set_value(id); self } diff --git a/src/base/action/component/is_renderable.rs b/src/base/action/component/is_renderable.rs index 998421fd..7169d688 100644 --- a/src/base/action/component/is_renderable.rs +++ b/src/base/action/component/is_renderable.rs @@ -34,7 +34,7 @@ impl IsRenderable { } pub fn filter_by_referer_id(mut self, id: impl Into) -> Self { - self.referer_id.alter_value(id); + self.referer_id.set_value(id); self } diff --git a/src/base/component.rs b/src/base/component.rs index 801f565c..d0c8b23d 100644 --- a/src/base/component.rs +++ b/src/base/component.rs @@ -11,24 +11,24 @@ pub const PARAM_BASE_INCLUDE_MENU_ASSETS: &str = "base.include.menu"; pub(crate) fn add_base_assets(cx: &mut Context) { let weight = cx.get_param::(PARAM_BASE_WEIGHT).unwrap_or(-90); - cx.alter_assets(AssetsOp::AddStyleSheet( + cx.set_assets(AssetsOp::AddStyleSheet( StyleSheet::at("/base/css/root.css") .with_version("0.0.1") .with_weight(weight), )) - .alter_assets(AssetsOp::AddStyleSheet( + .set_assets(AssetsOp::AddStyleSheet( StyleSheet::at("/base/css/looks.css") .with_version("0.0.1") .with_weight(weight), )) - .alter_assets(AssetsOp::AddStyleSheet( + .set_assets(AssetsOp::AddStyleSheet( StyleSheet::at("/base/css/buttons.css") .with_version("0.0.2") .with_weight(weight), )); if let Ok(true) = cx.get_param::(PARAM_BASE_INCLUDE_ICONS) { - cx.alter_assets(AssetsOp::AddStyleSheet( + cx.set_assets(AssetsOp::AddStyleSheet( StyleSheet::at("/base/css/icons.min.css") .with_version("1.11.1") .with_weight(weight), @@ -36,7 +36,7 @@ pub(crate) fn add_base_assets(cx: &mut Context) { } if let Ok(true) = cx.get_param::(PARAM_BASE_INCLUDE_FLEX_ASSETS) { - cx.alter_assets(AssetsOp::AddStyleSheet( + cx.set_assets(AssetsOp::AddStyleSheet( StyleSheet::at("/base/css/flex.css") .with_version("0.0.1") .with_weight(weight), @@ -44,12 +44,12 @@ pub(crate) fn add_base_assets(cx: &mut Context) { } if let Ok(true) = cx.get_param::(PARAM_BASE_INCLUDE_MENU_ASSETS) { - cx.alter_assets(AssetsOp::AddStyleSheet( + cx.set_assets(AssetsOp::AddStyleSheet( StyleSheet::at("/base/css/menu.css") .with_version("0.0.1") .with_weight(weight), )) - .alter_assets(AssetsOp::AddJavaScript( + .set_assets(AssetsOp::AddJavaScript( JavaScript::at("/base/js/menu.js") .with_version("0.0.1") .with_weight(weight), diff --git a/src/base/component/basic/fluent.rs b/src/base/component/basic/fluent.rs index 8e12263f..9e7220fa 100644 --- a/src/base/component/basic/fluent.rs +++ b/src/base/component/basic/fluent.rs @@ -18,7 +18,7 @@ impl Fluent { Fluent(l10n) } - pub fn alter_l10n(&mut self, l10n: L10n) -> &mut Self { + pub fn set_l10n(&mut self, l10n: L10n) -> &mut Self { self.0 = l10n; self } diff --git a/src/base/component/basic/html.rs b/src/base/component/basic/html.rs index feb16288..6d308438 100644 --- a/src/base/component/basic/html.rs +++ b/src/base/component/basic/html.rs @@ -18,7 +18,7 @@ impl Html { Html(html) } - pub fn alter_html(&mut self, html: Markup) -> &mut Self { + pub fn set_html(&mut self, html: Markup) -> &mut Self { self.0 = html; self } diff --git a/src/base/component/block.rs b/src/base/component/block.rs index 30b0181d..59d22ed8 100644 --- a/src/base/component/block.rs +++ b/src/base/component/block.rs @@ -20,7 +20,7 @@ impl ComponentTrait for Block { } fn setup_before_prepare(&mut self, _cx: &mut Context) { - self.alter_classes( + self.set_classes( ClassesOp::Prepend, ["block__container".to_string(), self.style().to_string()].join(" "), ); @@ -50,32 +50,32 @@ impl Block { // Block BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_style(&mut self, style: StyleBase) -> &mut Self { + pub fn set_style(&mut self, style: StyleBase) -> &mut Self { self.style = style; self } #[fn_builder] - pub fn alter_title(&mut self, title: L10n) -> &mut Self { - self.title.alter_value(title); + pub fn set_title(&mut self, title: L10n) -> &mut Self { + self.title.set_value(title); self } #[fn_builder] - pub fn alter_components(&mut self, op: AnyOp) -> &mut Self { - self.mixed.alter_value(op); + pub fn set_components(&mut self, op: AnyOp) -> &mut Self { + self.mixed.set_value(op); self } #[rustfmt::skip] pub fn add_component(mut self, component: impl ComponentTrait) -> Self { - self.mixed.alter_value(AnyOp::Add(AnyComponent::with(component))); + self.mixed.set_value(AnyOp::Add(AnyComponent::with(component))); self } diff --git a/src/base/component/branding.rs b/src/base/component/branding.rs index 84a563ad..e4f9b439 100644 --- a/src/base/component/branding.rs +++ b/src/base/component/branding.rs @@ -53,31 +53,31 @@ impl Branding { // Branding BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_app_name(&mut self, app_name: impl Into) -> &mut Self { + pub fn set_app_name(&mut self, app_name: impl Into) -> &mut Self { self.app_name = app_name.into(); self } #[fn_builder] - pub fn alter_slogan(&mut self, slogan: L10n) -> &mut Self { - self.slogan.alter_value(slogan); + pub fn set_slogan(&mut self, slogan: L10n) -> &mut Self { + self.slogan.set_value(slogan); self } #[fn_builder] - pub fn alter_logo(&mut self, logo: Option) -> &mut Self { - self.logo.alter_value(logo); + pub fn set_logo(&mut self, logo: Option) -> &mut Self { + self.logo.set_value(logo); self } #[fn_builder] - pub fn alter_frontpage(&mut self, frontpage: FnContextualPath) -> &mut Self { + pub fn set_frontpage(&mut self, frontpage: FnContextualPath) -> &mut Self { self.frontpage = frontpage; self } diff --git a/src/base/component/button.rs b/src/base/component/button.rs index b97a2671..2215a4bb 100644 --- a/src/base/component/button.rs +++ b/src/base/component/button.rs @@ -34,7 +34,7 @@ impl ComponentTrait for Button { } fn setup_before_prepare(&mut self, _cx: &mut Context) { - self.alter_classes( + self.set_classes( ClassesOp::Prepend, [ "button__tap".to_string(), @@ -48,11 +48,11 @@ impl ComponentTrait for Button { #[rustfmt::skip] fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup { let target = match &self.target() { - ButtonTarget::Blank => Some("_blank"), - ButtonTarget::Parent => Some("_parent"), - ButtonTarget::Top => Some("_top"), + ButtonTarget::Default => None, + ButtonTarget::Blank => Some("_blank"), + ButtonTarget::Parent => Some("_parent"), + ButtonTarget::Top => Some("_top"), ButtonTarget::Context(name) => Some(name.as_str()), - _ => None, }; PrepareMarkup::With(html! { a @@ -77,49 +77,49 @@ impl Button { // Button BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_style(&mut self, style: StyleBase) -> &mut Self { + pub fn set_style(&mut self, style: StyleBase) -> &mut Self { self.style = style; self } #[fn_builder] - pub fn alter_font_size(&mut self, font_size: FontSize) -> &mut Self { + pub fn set_font_size(&mut self, font_size: FontSize) -> &mut Self { self.font_size = font_size; self } #[fn_builder] - pub fn alter_left_icon(&mut self, icon: Option) -> &mut Self { - self.left_icon.alter_value(icon); + pub fn set_left_icon(&mut self, icon: Option) -> &mut Self { + self.left_icon.set_value(icon); self } #[fn_builder] - pub fn alter_right_icon(&mut self, icon: Option) -> &mut Self { - self.right_icon.alter_value(icon); + pub fn set_right_icon(&mut self, icon: Option) -> &mut Self { + self.right_icon.set_value(icon); self } #[fn_builder] - pub fn alter_href(&mut self, href: impl Into) -> &mut Self { - self.href.alter_value(href); + pub fn set_href(&mut self, href: impl Into) -> &mut Self { + self.href.set_value(href); self } #[fn_builder] - pub fn alter_html(&mut self, html: L10n) -> &mut Self { - self.html.alter_value(html); + pub fn set_html(&mut self, html: L10n) -> &mut Self { + self.html.set_value(html); self } #[fn_builder] - pub fn alter_target(&mut self, target: ButtonTarget) -> &mut Self { + pub fn set_target(&mut self, target: ButtonTarget) -> &mut Self { self.target = target; self } diff --git a/src/base/component/flex/container.rs b/src/base/component/flex/container.rs index 7bf5ac62..0c2cbb18 100644 --- a/src/base/component/flex/container.rs +++ b/src/base/component/flex/container.rs @@ -35,7 +35,7 @@ impl ComponentTrait for Container { } fn setup_before_prepare(&mut self, cx: &mut Context) { - self.alter_classes( + self.set_classes( ClassesOp::Prepend, [ "flex__container".to_string(), @@ -134,49 +134,49 @@ impl Container { // Container BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_direction(&mut self, direction: flex::Direction) -> &mut Self { + pub fn set_direction(&mut self, direction: flex::Direction) -> &mut Self { self.direction = direction; self } #[fn_builder] - pub fn alter_wrap(&mut self, wrap: flex::Wrap) -> &mut Self { + pub fn set_wrap(&mut self, wrap: flex::Wrap) -> &mut Self { self.flex_wrap = wrap; self } #[fn_builder] - pub fn alter_justify(&mut self, justify: flex::Justify) -> &mut Self { + pub fn set_justify(&mut self, justify: flex::Justify) -> &mut Self { self.flex_justify = justify; self } #[fn_builder] - pub fn alter_align(&mut self, align: flex::Align) -> &mut Self { + pub fn set_align(&mut self, align: flex::Align) -> &mut Self { self.flex_align = align; self } #[fn_builder] - pub fn alter_gap(&mut self, gap: flex::Gap) -> &mut Self { + pub fn set_gap(&mut self, gap: flex::Gap) -> &mut Self { self.flex_gap = gap; self } #[fn_builder] - pub fn alter_items(&mut self, op: TypedOp) -> &mut Self { - self.items.alter_typed(op); + pub fn set_items(&mut self, op: TypedOp) -> &mut Self { + self.items.set_typed(op); self } pub fn add_item(mut self, item: flex::Item) -> Self { - self.items.alter_value(AnyOp::Add(AnyComponent::with(item))); + self.items.set_value(AnyOp::Add(AnyComponent::with(item))); self } diff --git a/src/base/component/flex/item.rs b/src/base/component/flex/item.rs index 532e4e96..b1ec3073 100644 --- a/src/base/component/flex/item.rs +++ b/src/base/component/flex/item.rs @@ -33,7 +33,7 @@ impl ComponentTrait for Item { } fn setup_before_prepare(&mut self, _cx: &mut Context) { - self.alter_classes( + self.set_classes( ClassesOp::Prepend, [ "flex__item".to_string(), @@ -119,19 +119,19 @@ impl Item { // Item BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_grow(&mut self, grow: flex::Grow) -> &mut Self { + pub fn set_grow(&mut self, grow: flex::Grow) -> &mut Self { self.flex_grow = grow; self } #[fn_builder] - pub fn alter_shrink(&mut self, shrink: flex::Shrink) -> &mut Self { + pub fn set_shrink(&mut self, shrink: flex::Shrink) -> &mut Self { self.flex_shrink = shrink; self } @@ -139,32 +139,32 @@ impl Item { #[fn_builder] // Ensures the item occupies the exact specified width, neither growing nor shrinking, // regardless of the available space in the container or the size of other items. - pub fn alter_size(&mut self, size: flex::Size) -> &mut Self { + pub fn set_size(&mut self, size: flex::Size) -> &mut Self { self.flex_size = size; self } #[fn_builder] - pub fn alter_offset(&mut self, offset: flex::Offset) -> &mut Self { + pub fn set_offset(&mut self, offset: flex::Offset) -> &mut Self { self.flex_offset = offset; self } #[fn_builder] - pub fn alter_align(&mut self, align: flex::Align) -> &mut Self { + pub fn set_align(&mut self, align: flex::Align) -> &mut Self { self.flex_align = align; self } #[fn_builder] - pub fn alter_components(&mut self, op: AnyOp) -> &mut Self { - self.mixed.alter_value(op); + pub fn set_components(&mut self, op: AnyOp) -> &mut Self { + self.mixed.set_value(op); self } #[rustfmt::skip] pub fn add_component(mut self, component: impl ComponentTrait) -> Self { - self.mixed.alter_value(AnyOp::Add(AnyComponent::with(component))); + self.mixed.set_value(AnyOp::Add(AnyComponent::with(component))); self } diff --git a/src/base/component/form/action_button.rs b/src/base/component/form/action_button.rs index e0cf2eb0..93a99e65 100644 --- a/src/base/component/form/action_button.rs +++ b/src/base/component/form/action_button.rs @@ -38,7 +38,7 @@ impl ComponentTrait for ActionButton { } fn setup_before_prepare(&mut self, _cx: &mut Context) { - self.alter_classes( + self.set_classes( ClassesOp::Prepend, [ "button__tap".to_string(), @@ -91,56 +91,52 @@ impl ActionButton { // Button BUILDER. #[fn_builder] - pub fn alter_style(&mut self, style: StyleBase) -> &mut Self { + pub fn set_style(&mut self, style: StyleBase) -> &mut Self { self.style = style; self } #[fn_builder] - pub fn alter_font_size(&mut self, font_size: FontSize) -> &mut Self { + pub fn set_font_size(&mut self, font_size: FontSize) -> &mut Self { self.font_size = font_size; self } #[fn_builder] - pub fn alter_left_icon(&mut self, icon: Option) -> &mut Self { - self.left_icon.alter_value(icon); + pub fn set_left_icon(&mut self, icon: Option) -> &mut Self { + self.left_icon.set_value(icon); self } #[fn_builder] - pub fn alter_right_icon(&mut self, icon: Option) -> &mut Self { - self.right_icon.alter_value(icon); + pub fn set_right_icon(&mut self, icon: Option) -> &mut Self { + self.right_icon.set_value(icon); self } #[fn_builder] - pub fn alter_name(&mut self, name: &str) -> &mut Self { - self.name.alter_value(name); + pub fn set_name(&mut self, name: &str) -> &mut Self { + self.name.set_value(name); self } #[fn_builder] - pub fn alter_value(&mut self, value: L10n) -> &mut Self { - self.value.alter_value(value); + pub fn set_value(&mut self, value: L10n) -> &mut Self { + self.value.set_value(value); self } #[fn_builder] - pub fn alter_autofocus(&mut self, toggle: bool) -> &mut Self { - self.autofocus.alter_value(match toggle { - true => "autofocus", - false => "", - }); + pub fn set_autofocus(&mut self, toggle: bool) -> &mut Self { + self.autofocus + .set_value(if toggle { "autofocus" } else { "" }); self } #[fn_builder] - pub fn alter_disabled(&mut self, toggle: bool) -> &mut Self { - self.disabled.alter_value(match toggle { - true => "disabled", - false => "", - }); + pub fn set_disabled(&mut self, toggle: bool) -> &mut Self { + self.disabled + .set_value(if toggle { "disabled" } else { "" }); self } diff --git a/src/base/component/form/date.rs b/src/base/component/form/date.rs index 21377824..859a2e86 100644 --- a/src/base/component/form/date.rs +++ b/src/base/component/form/date.rs @@ -59,77 +59,66 @@ impl Date { // Date BUILDER. #[fn_builder] - pub fn alter_name(&mut self, name: &str) -> &mut Self { - self.name.alter_value(name); + pub fn set_name(&mut self, name: &str) -> &mut Self { + self.name.set_value(name); self } #[fn_builder] - pub fn alter_value(&mut self, value: &str) -> &mut Self { - self.value.alter_value(value); + pub fn set_value(&mut self, value: &str) -> &mut Self { + self.value.set_value(value); self } #[fn_builder] - pub fn alter_label(&mut self, label: &str) -> &mut Self { - self.label.alter_value(label); + pub fn set_label(&mut self, label: &str) -> &mut Self { + self.label.set_value(label); self } #[fn_builder] - pub fn alter_placeholder(&mut self, placeholder: &str) -> &mut Self { - self.placeholder.alter_value(placeholder); + pub fn set_placeholder(&mut self, placeholder: &str) -> &mut Self { + self.placeholder.set_value(placeholder); self } #[fn_builder] - pub fn alter_autofocus(&mut self, toggle: bool) -> &mut Self { - self.autofocus.alter_value(match toggle { - true => "autofocus", - false => "", - }); + pub fn set_autofocus(&mut self, toggle: bool) -> &mut Self { + self.autofocus + .set_value(if toggle { "autofocus" } else { "" }); self } #[fn_builder] - pub fn alter_autocomplete(&mut self, toggle: bool) -> &mut Self { - self.autocomplete.alter_value(match toggle { - true => "", - false => "off", - }); + pub fn set_autocomplete(&mut self, toggle: bool) -> &mut Self { + self.autocomplete.set_value(if toggle { "" } else { "off" }); self } #[fn_builder] - pub fn alter_disabled(&mut self, toggle: bool) -> &mut Self { - self.disabled.alter_value(match toggle { - true => "disabled", - false => "", - }); + pub fn set_disabled(&mut self, toggle: bool) -> &mut Self { + self.disabled + .set_value(if toggle { "disabled" } else { "" }); self } #[fn_builder] - pub fn alter_readonly(&mut self, toggle: bool) -> &mut Self { - self.readonly.alter_value(match toggle { - true => "readonly", - false => "", - }); + pub fn set_readonly(&mut self, toggle: bool) -> &mut Self { + self.readonly + .set_value(if toggle { "readonly" } else { "" }); self } #[fn_builder] - pub fn alter_required(&mut self, toggle: bool) -> &mut Self { - self.required.alter_value(match toggle { - true => "required", - false => "", - }); + pub fn set_required(&mut self, toggle: bool) -> &mut Self { + self.required + .set_value(if toggle { "required" } else { "" }); self } #[fn_builder] - pub fn alter_help_text(&mut self, help_text: &str) -> &mut Self { - self.help_text.alter_value(help_text); + pub fn set_help_text(&mut self, help_text: &str) -> &mut Self { + self.help_text.set_value(help_text); self } diff --git a/src/base/component/form/form_main.rs b/src/base/component/form/form_main.rs index 39577060..b630571c 100644 --- a/src/base/component/form/form_main.rs +++ b/src/base/component/form/form_main.rs @@ -52,38 +52,38 @@ impl Form { // Form BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_action(&mut self, action: &str) -> &mut Self { - self.action.alter_value(action); + pub fn set_action(&mut self, action: &str) -> &mut Self { + self.action.set_value(action); self } #[fn_builder] - pub fn alter_charset(&mut self, charset: &str) -> &mut Self { - self.charset.alter_value(charset); + pub fn set_charset(&mut self, charset: &str) -> &mut Self { + self.charset.set_value(charset); self } #[fn_builder] - pub fn alter_method(&mut self, method: FormMethod) -> &mut Self { + pub fn set_method(&mut self, method: FormMethod) -> &mut Self { self.method = method; self } #[fn_builder] - pub fn alter_elements(&mut self, op: AnyOp) -> &mut Self { - self.mixed.alter_value(op); + pub fn set_elements(&mut self, op: AnyOp) -> &mut Self { + self.mixed.set_value(op); self } #[rustfmt::skip] pub fn add_element(mut self, element: impl ComponentTrait) -> Self { - self.mixed.alter_value(AnyOp::Add(AnyComponent::with(element))); + self.mixed.set_value(AnyOp::Add(AnyComponent::with(element))); self } diff --git a/src/base/component/form/hidden.rs b/src/base/component/form/hidden.rs index 910a4c66..66bfccb9 100644 --- a/src/base/component/form/hidden.rs +++ b/src/base/component/form/hidden.rs @@ -28,14 +28,14 @@ impl Hidden { // Hidden BUILDER. #[fn_builder] - pub fn alter_name(&mut self, name: &str) -> &mut Self { - self.name.alter_value(name); + pub fn set_name(&mut self, name: &str) -> &mut Self { + self.name.set_value(name); self } #[fn_builder] - pub fn alter_value(&mut self, value: &str) -> &mut Self { - self.value.alter_value(value); + pub fn set_value(&mut self, value: &str) -> &mut Self { + self.value.set_value(value); self } diff --git a/src/base/component/form/input.rs b/src/base/component/form/input.rs index 4673f70a..a59d77c8 100644 --- a/src/base/component/form/input.rs +++ b/src/base/component/form/input.rs @@ -138,99 +138,88 @@ impl Input { // Input BUILDER. #[fn_builder] - pub fn alter_name(&mut self, name: &str) -> &mut Self { + pub fn set_name(&mut self, name: &str) -> &mut Self { if let Some(previous) = self.name.get() { - self.alter_classes(ClassesOp::Remove, concat_string!("form-item-", previous)); + self.set_classes(ClassesOp::Remove, concat_string!("form-item-", previous)); } - self.alter_classes(ClassesOp::Add, concat_string!("form-item-", name)); - self.name.alter_value(name); + self.set_classes(ClassesOp::Add, concat_string!("form-item-", name)); + self.name.set_value(name); self } #[fn_builder] - pub fn alter_value(&mut self, value: &str) -> &mut Self { - self.value.alter_value(value); + pub fn set_value(&mut self, value: &str) -> &mut Self { + self.value.set_value(value); self } #[fn_builder] - pub fn alter_label(&mut self, label: L10n) -> &mut Self { - self.label.alter_value(label); + pub fn set_label(&mut self, label: L10n) -> &mut Self { + self.label.set_value(label); self } #[fn_builder] - pub fn alter_size(&mut self, size: Option) -> &mut Self { + pub fn set_size(&mut self, size: Option) -> &mut Self { self.size = size; self } #[fn_builder] - pub fn alter_minlength(&mut self, minlength: Option) -> &mut Self { + pub fn set_minlength(&mut self, minlength: Option) -> &mut Self { self.minlength = minlength; self } #[fn_builder] - pub fn alter_maxlength(&mut self, maxlength: Option) -> &mut Self { + pub fn set_maxlength(&mut self, maxlength: Option) -> &mut Self { self.maxlength = maxlength; self } #[fn_builder] - pub fn alter_placeholder(&mut self, placeholder: &str) -> &mut Self { - self.placeholder.alter_value(placeholder); + pub fn set_placeholder(&mut self, placeholder: &str) -> &mut Self { + self.placeholder.set_value(placeholder); self } #[fn_builder] - pub fn alter_autofocus(&mut self, toggle: bool) -> &mut Self { - self.autofocus.alter_value(match toggle { - true => "autofocus", - false => "", - }); + pub fn set_autofocus(&mut self, toggle: bool) -> &mut Self { + self.autofocus + .set_value(if toggle { "autofocus" } else { "" }); self } #[fn_builder] - pub fn alter_autocomplete(&mut self, toggle: bool) -> &mut Self { - self.autocomplete.alter_value(match toggle { - true => "", - false => "off", - }); + pub fn set_autocomplete(&mut self, toggle: bool) -> &mut Self { + self.autocomplete.set_value(if toggle { "" } else { "off" }); self } #[fn_builder] - pub fn alter_disabled(&mut self, toggle: bool) -> &mut Self { - self.disabled.alter_value(match toggle { - true => "disabled", - false => "", - }); + pub fn set_disabled(&mut self, toggle: bool) -> &mut Self { + self.disabled + .set_value(if toggle { "disabled" } else { "" }); self } #[fn_builder] - pub fn alter_readonly(&mut self, toggle: bool) -> &mut Self { - self.readonly.alter_value(match toggle { - true => "readonly", - false => "", - }); + pub fn set_readonly(&mut self, toggle: bool) -> &mut Self { + self.readonly + .set_value(if toggle { "readonly" } else { "" }); self } #[fn_builder] - pub fn alter_required(&mut self, toggle: bool) -> &mut Self { - self.required.alter_value(match toggle { - true => "required", - false => "", - }); + pub fn set_required(&mut self, toggle: bool) -> &mut Self { + self.required + .set_value(if toggle { "required" } else { "" }); self } #[fn_builder] - pub fn alter_help_text(&mut self, help_text: L10n) -> &mut Self { - self.help_text.alter_value(help_text); + pub fn set_help_text(&mut self, help_text: L10n) -> &mut Self { + self.help_text.set_value(help_text); self } diff --git a/src/base/component/heading.rs b/src/base/component/heading.rs index d620f8e9..30d33f45 100644 --- a/src/base/component/heading.rs +++ b/src/base/component/heading.rs @@ -58,7 +58,7 @@ impl ComponentTrait for Heading { } fn setup_before_prepare(&mut self, _cx: &mut Context) { - self.alter_classes(ClassesOp::Add, self.size().to_string()); + self.set_classes(ClassesOp::Add, self.size().to_string()); } fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup { @@ -116,26 +116,26 @@ impl Heading { // Heading BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_heading_type(&mut self, heading_type: HeadingType) -> &mut Self { + pub fn set_heading_type(&mut self, heading_type: HeadingType) -> &mut Self { self.heading_type = heading_type; self } #[fn_builder] - pub fn alter_size(&mut self, size: HeadingSize) -> &mut Self { + pub fn set_size(&mut self, size: HeadingSize) -> &mut Self { self.size = size; self } #[fn_builder] - pub fn alter_text(&mut self, text: L10n) -> &mut Self { - self.text.alter_value(text); + pub fn set_text(&mut self, text: L10n) -> &mut Self { + self.text.set_value(text); self } diff --git a/src/base/component/icon.rs b/src/base/component/icon.rs index a8c62ce2..7e0a6a1e 100644 --- a/src/base/component/icon.rs +++ b/src/base/component/icon.rs @@ -16,10 +16,10 @@ impl ComponentTrait for Icon { #[rustfmt::skip] fn setup_before_prepare(&mut self, cx: &mut Context) { if let Some(icon_name) = self.icon_name().get() { - self.alter_classes(ClassesOp::Prepend, + self.set_classes(ClassesOp::Prepend, concat_string!("bi-", icon_name, " ", self.font_size().to_string()), ); - cx.set_param::(PARAM_BASE_INCLUDE_ICONS, true); + cx.set_param::(PARAM_BASE_INCLUDE_ICONS, &true); } } @@ -39,13 +39,13 @@ impl Icon { // Icon BUILDER. #[fn_builder] - pub fn alter_icon_name(&mut self, name: impl Into) -> &mut Self { - self.icon_name.alter_value(name); + pub fn set_icon_name(&mut self, name: impl Into) -> &mut Self { + self.icon_name.set_value(name); self } #[fn_builder] - pub fn alter_font_size(&mut self, font_size: FontSize) -> &mut Self { + pub fn set_font_size(&mut self, font_size: FontSize) -> &mut Self { self.font_size = font_size; self } diff --git a/src/base/component/image.rs b/src/base/component/image.rs index 0a412ea1..dcf2c625 100644 --- a/src/base/component/image.rs +++ b/src/base/component/image.rs @@ -73,19 +73,19 @@ impl Image { // Image BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_source(&mut self, source: &str) -> &mut Self { - self.source.alter_value(source); + pub fn set_source(&mut self, source: &str) -> &mut Self { + self.source.set_value(source); self } #[fn_builder] - pub fn alter_size(&mut self, size: ImageSize) -> &mut Self { + pub fn set_size(&mut self, size: ImageSize) -> &mut Self { self.size = size; self } diff --git a/src/base/component/menu/group.rs b/src/base/component/menu/group.rs index fecb76da..d3b8a33d 100644 --- a/src/base/component/menu/group.rs +++ b/src/base/component/menu/group.rs @@ -31,20 +31,20 @@ impl Group { // Group BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_elements(&mut self, op: TypedOp) -> &mut Self { - self.elements.alter_typed(op); + pub fn set_elements(&mut self, op: TypedOp) -> &mut Self { + self.elements.set_typed(op); self } #[rustfmt::skip] pub fn add_element(mut self, element: Element) -> Self { - self.elements.alter_value(AnyOp::Add(AnyComponent::with(element))); + self.elements.set_value(AnyOp::Add(AnyComponent::with(element))); self } diff --git a/src/base/component/menu/item.rs b/src/base/component/menu/item.rs index fd77f728..e59899b0 100644 --- a/src/base/component/menu/item.rs +++ b/src/base/component/menu/item.rs @@ -147,20 +147,20 @@ impl Item { // Item BUILDER. #[fn_builder] - pub fn alter_description(&mut self, text: L10n) -> &mut Self { - self.description.alter_value(text); + pub fn set_description(&mut self, text: L10n) -> &mut Self { + self.description.set_value(text); self } #[fn_builder] - pub fn alter_left_icon(&mut self, icon: Option) -> &mut Self { - self.left_icon.alter_value(icon); + pub fn set_left_icon(&mut self, icon: Option) -> &mut Self { + self.left_icon.set_value(icon); self } #[fn_builder] - pub fn alter_right_icon(&mut self, icon: Option) -> &mut Self { - self.right_icon.alter_value(icon); + pub fn set_right_icon(&mut self, icon: Option) -> &mut Self { + self.right_icon.set_value(icon); self } diff --git a/src/base/component/menu/megamenu.rs b/src/base/component/menu/megamenu.rs index 91b8e1be..5a21ddd5 100644 --- a/src/base/component/menu/megamenu.rs +++ b/src/base/component/menu/megamenu.rs @@ -31,20 +31,20 @@ impl Megamenu { // Megamenu BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_groups(&mut self, op: TypedOp) -> &mut Self { - self.groups.alter_typed(op); + pub fn set_groups(&mut self, op: TypedOp) -> &mut Self { + self.groups.set_typed(op); self } #[rustfmt::skip] pub fn add_group(mut self, group: Group) -> Self { - self.groups.alter_value(AnyOp::Add(AnyComponent::with(group))); + self.groups.set_value(AnyOp::Add(AnyComponent::with(group))); self } diff --git a/src/base/component/menu/menu_main.rs b/src/base/component/menu/menu_main.rs index db5babb4..0ecbceee 100644 --- a/src/base/component/menu/menu_main.rs +++ b/src/base/component/menu/menu_main.rs @@ -59,20 +59,20 @@ impl Menu { // Menu BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_items(&mut self, op: TypedOp) -> &mut Self { - self.items.alter_typed(op); + pub fn set_items(&mut self, op: TypedOp) -> &mut Self { + self.items.set_typed(op); self } #[rustfmt::skip] pub fn add_item(mut self, item: Item) -> Self { - self.items.alter_value(AnyOp::Add(AnyComponent::with(item))); + self.items.set_value(AnyOp::Add(AnyComponent::with(item))); self } diff --git a/src/base/component/menu/submenu.rs b/src/base/component/menu/submenu.rs index 38b5aa08..4e5e91df 100644 --- a/src/base/component/menu/submenu.rs +++ b/src/base/component/menu/submenu.rs @@ -37,26 +37,26 @@ impl Submenu { // Submenu BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_title(&mut self, title: L10n) -> &mut Self { - self.title.alter_value(title); + pub fn set_title(&mut self, title: L10n) -> &mut Self { + self.title.set_value(title); self } #[fn_builder] - pub fn alter_items(&mut self, op: TypedOp) -> &mut Self { - self.items.alter_typed(op); + pub fn set_items(&mut self, op: TypedOp) -> &mut Self { + self.items.set_typed(op); self } #[rustfmt::skip] pub fn add_item(mut self, item: Item) -> Self { - self.items.alter_value(AnyOp::Add(AnyComponent::with(item))); + self.items.set_value(AnyOp::Add(AnyComponent::with(item))); self } diff --git a/src/base/component/paragraph.rs b/src/base/component/paragraph.rs index 269383d9..9beeefa8 100644 --- a/src/base/component/paragraph.rs +++ b/src/base/component/paragraph.rs @@ -19,7 +19,7 @@ impl ComponentTrait for Paragraph { } fn setup_before_prepare(&mut self, _cx: &mut Context) { - self.alter_classes(ClassesOp::Prepend, self.font_size().to_string()); + self.set_classes(ClassesOp::Prepend, self.font_size().to_string()); } fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup { @@ -46,26 +46,26 @@ impl Paragraph { // Paragraph BUILDER. #[fn_builder] - pub fn alter_id(&mut self, id: impl Into) -> &mut Self { - self.id.alter_value(id); + pub fn set_id(&mut self, id: impl Into) -> &mut Self { + self.id.set_value(id); self } #[fn_builder] - pub fn alter_font_size(&mut self, font_size: FontSize) -> &mut Self { + pub fn set_font_size(&mut self, font_size: FontSize) -> &mut Self { self.font_size = font_size; self } #[fn_builder] - pub fn alter_components(&mut self, op: AnyOp) -> &mut Self { - self.mixed.alter_value(op); + pub fn set_components(&mut self, op: AnyOp) -> &mut Self { + self.mixed.set_value(op); self } #[rustfmt::skip] pub fn add_component(mut self, component: impl ComponentTrait) -> Self { - self.mixed.alter_value(AnyOp::Add(AnyComponent::with(component))); + self.mixed.set_value(AnyOp::Add(AnyComponent::with(component))); self } diff --git a/src/base/component/powered_by.rs b/src/base/component/powered_by.rs index 47449191..69be525d 100644 --- a/src/base/component/powered_by.rs +++ b/src/base/component/powered_by.rs @@ -1,5 +1,7 @@ use crate::prelude::*; +use std::convert::Into; + #[derive(Default, Eq, PartialEq)] pub enum PoweredByLogo { #[default] @@ -58,13 +60,13 @@ impl PoweredBy { // PoweredBy BUILDER. #[fn_builder] - pub fn alter_copyright(&mut self, copyright: Option>) -> &mut Self { - self.copyright = copyright.map(|c| c.into()); + pub fn set_copyright(&mut self, copyright: Option>) -> &mut Self { + self.copyright = copyright.map(Into::into); self } #[fn_builder] - pub fn alter_logo(&mut self, logo: PoweredByLogo) -> &mut Self { + pub fn set_logo(&mut self, logo: PoweredByLogo) -> &mut Self { self.logo = logo; self } diff --git a/src/base/theme/basic.rs b/src/base/theme/basic.rs index 9c2cf3c7..c7c41ba7 100644 --- a/src/base/theme/basic.rs +++ b/src/base/theme/basic.rs @@ -14,14 +14,14 @@ impl PackageTrait for Basic { impl ThemeTrait for Basic { fn after_prepare_body(&self, page: &mut Page) { - page.alter_favicon(Some(Favicon::new().with_icon("/base/favicon.ico"))) - .alter_assets(AssetsOp::AddStyleSheet( + page.set_favicon(Some(Favicon::new().with_icon("/base/favicon.ico"))) + .set_assets(AssetsOp::AddStyleSheet( StyleSheet::at("/base/css/normalize.min.css") .with_version("8.0.1") .with_weight(-90), )) - .alter_assets(AssetsOp::AddBaseAssets) - .alter_assets(AssetsOp::AddStyleSheet( + .set_assets(AssetsOp::AddBaseAssets) + .set_assets(AssetsOp::AddStyleSheet( StyleSheet::at("/base/css/basic.css") .with_version("0.0.1") .with_weight(-90), diff --git a/src/base/theme/chassis.rs b/src/base/theme/chassis.rs index fb6c34f4..49087f4f 100644 --- a/src/base/theme/chassis.rs +++ b/src/base/theme/chassis.rs @@ -14,14 +14,14 @@ impl PackageTrait for Chassis { impl ThemeTrait for Chassis { fn after_prepare_body(&self, page: &mut Page) { - page.alter_favicon(Some(Favicon::new().with_icon("/base/favicon.ico"))) - .alter_assets(AssetsOp::AddStyleSheet( + page.set_favicon(Some(Favicon::new().with_icon("/base/favicon.ico"))) + .set_assets(AssetsOp::AddStyleSheet( StyleSheet::at("/base/css/normalize.min.css") .with_version("8.0.1") .with_weight(-90), )) - .alter_assets(AssetsOp::AddBaseAssets) - .alter_assets(AssetsOp::AddStyleSheet( + .set_assets(AssetsOp::AddBaseAssets) + .set_assets(AssetsOp::AddStyleSheet( StyleSheet::at("/base/css/chassis.css") .with_version("0.0.1") .with_weight(-90), diff --git a/src/base/theme/inception.rs b/src/base/theme/inception.rs index 3492d5d4..bce761cd 100644 --- a/src/base/theme/inception.rs +++ b/src/base/theme/inception.rs @@ -14,14 +14,14 @@ impl PackageTrait for Inception { impl ThemeTrait for Inception { fn after_prepare_body(&self, page: &mut Page) { - page.alter_favicon(Some(Favicon::new().with_icon("/base/favicon.ico"))) - .alter_assets(AssetsOp::AddStyleSheet( + page.set_favicon(Some(Favicon::new().with_icon("/base/favicon.ico"))) + .set_assets(AssetsOp::AddStyleSheet( StyleSheet::at("/base/css/normalize.min.css") .with_version("8.0.1") .with_weight(-90), )) - .alter_assets(AssetsOp::AddBaseAssets) - .alter_assets(AssetsOp::AddStyleSheet( + .set_assets(AssetsOp::AddBaseAssets) + .set_assets(AssetsOp::AddStyleSheet( StyleSheet::at("/base/css/inception.css") .with_version("0.0.1") .with_weight(-90), diff --git a/src/core/component/classes.rs b/src/core/component/classes.rs index ab094be7..a61809c6 100644 --- a/src/core/component/classes.rs +++ b/src/core/component/classes.rs @@ -6,14 +6,14 @@ pub trait ComponentClassesOp { } pub trait ComponentClasses: ComponentBase + ComponentClassesOp { - fn alter_classes(&mut self, op: ClassesOp, classes: impl Into) -> &mut Self; + fn set_classes(&mut self, op: ClassesOp, classes: impl Into) -> &mut Self; fn classes(&self) -> &OptionClasses; } impl ComponentClassesOp for C { fn with_classes(mut self, op: ClassesOp, classes: impl Into) -> Self { - self.alter_classes(op, classes); + self.set_classes(op, classes); self } } diff --git a/src/core/component/context.rs b/src/core/component/context.rs index 37531e44..35dabe89 100644 --- a/src/core/component/context.rs +++ b/src/core/component/context.rs @@ -85,7 +85,7 @@ impl Context { } #[rustfmt::skip] - pub fn alter_assets(&mut self, op: AssetsOp) -> &mut Self { + pub fn set_assets(&mut self, op: AssetsOp) -> &mut Self { match op { AssetsOp::LangId(langid) => { self.langid = langid; @@ -116,8 +116,8 @@ impl Context { self } - pub fn alter_regions(&mut self, region: &'static str, op: AnyOp) -> &mut Self { - self.regions.alter_components(region, op); + pub fn set_regions(&mut self, region: &'static str, op: AnyOp) -> &mut Self { + self.regions.set_components(region, op); self } diff --git a/src/core/component/mixed.rs b/src/core/component/mixed.rs index b367417f..e93444bb 100644 --- a/src/core/component/mixed.rs +++ b/src/core/component/mixed.rs @@ -102,7 +102,7 @@ impl MixedComponents { // MixedComponents BUILDER. #[fn_builder] - pub fn alter_value(&mut self, op: AnyOp) -> &mut Self { + pub fn set_value(&mut self, op: AnyOp) -> &mut Self { match op { AnyOp::Add(any) => self.add(any), AnyOp::InsertAfterId(id, any) => self.insert_after_id(id, any), @@ -116,7 +116,7 @@ impl MixedComponents { } #[fn_builder] - pub fn alter_typed(&mut self, op: TypedOp) -> &mut Self { + pub fn set_typed(&mut self, op: TypedOp) -> &mut Self { match op { TypedOp::Add(typed) => self.add(typed.to_any()), TypedOp::InsertAfterId(id, typed) => self.insert_after_id(id, typed.to_any()), @@ -164,7 +164,7 @@ impl MixedComponents { #[inline] fn replace_by_id(&mut self, id: &str, any: AnyComponent) { - for c in self.0.iter_mut() { + for c in &mut self.0 { if c.id() == id { *c = any; break; @@ -205,7 +205,7 @@ impl MixedComponents { pub fn render(&self, cx: &mut Context) -> Markup { html! { - @for c in self.0.iter() { + @for c in &self.0 { (c.render(cx)) } } diff --git a/src/core/theme/definition.rs b/src/core/theme/definition.rs index 376aeae5..e3f3a733 100644 --- a/src/core/theme/definition.rs +++ b/src/core/theme/definition.rs @@ -71,7 +71,7 @@ pub trait ThemeTrait: PackageTrait + Send + Sync { fn after_prepare_body(&self, page: &mut Page) { if page.favicon().is_none() { - page.alter_favicon(Some(Favicon::new().with_icon("/base/favicon.ico"))); + page.set_favicon(Some(Favicon::new().with_icon("/base/favicon.ico"))); } } diff --git a/src/core/theme/regions.rs b/src/core/theme/regions.rs index 56b46cdc..da2e24ff 100644 --- a/src/core/theme/regions.rs +++ b/src/core/theme/regions.rs @@ -20,9 +20,9 @@ impl ComponentsInRegions { } #[fn_builder] - pub fn alter_components(&mut self, region: &'static str, op: AnyOp) -> &mut Self { + pub fn set_components(&mut self, region: &'static str, op: AnyOp) -> &mut Self { if let Some(region) = self.0.get_mut(region) { - region.alter_value(op); + region.set_value(op); } else { self.0.insert(region, MixedComponents::new().with_value(op)); } @@ -52,18 +52,18 @@ impl InRegion { COMMON_REGIONS .write() .unwrap() - .alter_components("content", AnyOp::Add(any)); + .set_components("content", AnyOp::Add(any)); } InRegion::Named(name) => { COMMON_REGIONS .write() .unwrap() - .alter_components(name, AnyOp::Add(any)); + .set_components(name, AnyOp::Add(any)); } InRegion::OfTheme(region, theme) => { let mut regions = THEME_REGIONS.write().unwrap(); if let Some(r) = regions.get_mut(&theme.type_id()) { - r.alter_components(region, AnyOp::Add(any)); + r.set_components(region, AnyOp::Add(any)); } else { regions.insert(theme.type_id(), ComponentsInRegions::new(region, any)); } diff --git a/src/html/opt_classes.rs b/src/html/opt_classes.rs index 35392ac3..b631da64 100644 --- a/src/html/opt_classes.rs +++ b/src/html/opt_classes.rs @@ -31,7 +31,7 @@ impl OptionClasses { // OptionClasses BUILDER. #[fn_builder] - pub fn alter_value(&mut self, op: ClassesOp, classes: impl Into) -> &mut Self { + pub fn set_value(&mut self, op: ClassesOp, classes: impl Into) -> &mut Self { let classes: String = classes.into(); let classes: Vec<&str> = classes.split_ascii_whitespace().collect(); diff --git a/src/html/opt_component.rs b/src/html/opt_component.rs index 9bb4523c..897d94f6 100644 --- a/src/html/opt_component.rs +++ b/src/html/opt_component.rs @@ -18,7 +18,7 @@ impl OptionComponent { // OptionComponent BUILDER. #[fn_builder] - pub fn alter_value(&mut self, component: Option) -> &mut Self { + pub fn set_value(&mut self, component: Option) -> &mut Self { if let Some(component) = component { self.0 = Some(TypedComponent::with(component)); } else { diff --git a/src/html/opt_id.rs b/src/html/opt_id.rs index 6500c14a..80e98325 100644 --- a/src/html/opt_id.rs +++ b/src/html/opt_id.rs @@ -11,7 +11,7 @@ impl OptionId { // OptionId BUILDER. #[fn_builder] - pub fn alter_value(&mut self, value: impl Into) -> &mut Self { + pub fn set_value(&mut self, value: impl Into) -> &mut Self { self.0 = Some(value.into().trim().replace(' ', "_")); self } diff --git a/src/html/opt_name.rs b/src/html/opt_name.rs index 9a668e3a..5ba0c486 100644 --- a/src/html/opt_name.rs +++ b/src/html/opt_name.rs @@ -11,7 +11,7 @@ impl OptionName { // OptionName BUILDER. #[fn_builder] - pub fn alter_value(&mut self, value: impl Into) -> &mut Self { + pub fn set_value(&mut self, value: impl Into) -> &mut Self { self.0 = Some(value.into().trim().replace(' ', "_")); self } diff --git a/src/html/opt_string.rs b/src/html/opt_string.rs index 36c467ac..7de22486 100644 --- a/src/html/opt_string.rs +++ b/src/html/opt_string.rs @@ -11,7 +11,7 @@ impl OptionString { // OptionString BUILDER. #[fn_builder] - pub fn alter_value(&mut self, value: impl Into) -> &mut Self { + pub fn set_value(&mut self, value: impl Into) -> &mut Self { self.0 = Some(value.into().trim().to_owned()); self } diff --git a/src/html/opt_translated.rs b/src/html/opt_translated.rs index acefac08..e50a073f 100644 --- a/src/html/opt_translated.rs +++ b/src/html/opt_translated.rs @@ -13,7 +13,7 @@ impl OptionTranslated { // OptionTranslated BUILDER. #[fn_builder] - pub fn alter_value(&mut self, value: L10n) -> &mut Self { + pub fn set_value(&mut self, value: L10n) -> &mut Self { self.0 = value; self } diff --git a/src/response/page.rs b/src/response/page.rs index bcebe827..7de5d373 100644 --- a/src/response/page.rs +++ b/src/response/page.rs @@ -46,74 +46,74 @@ impl Page { // Page BUILDER. #[fn_builder] - pub fn alter_title(&mut self, title: L10n) -> &mut Self { - self.title.alter_value(title); + pub fn set_title(&mut self, title: L10n) -> &mut Self { + self.title.set_value(title); self } #[fn_builder] - pub fn alter_description(&mut self, description: L10n) -> &mut Self { - self.description.alter_value(description); + pub fn set_description(&mut self, description: L10n) -> &mut Self { + self.description.set_value(description); self } #[fn_builder] - pub fn alter_metadata(&mut self, name: &'static str, content: &'static str) -> &mut Self { + pub fn set_metadata(&mut self, name: &'static str, content: &'static str) -> &mut Self { self.metadata.push((name, content)); self } #[fn_builder] - pub fn alter_property(&mut self, property: &'static str, content: &'static str) -> &mut Self { + pub fn set_property(&mut self, property: &'static str, content: &'static str) -> &mut Self { self.metadata.push((property, content)); self } #[fn_builder] - pub fn alter_favicon(&mut self, favicon: Option) -> &mut Self { + pub fn set_favicon(&mut self, favicon: Option) -> &mut Self { self.favicon = favicon; self } #[fn_builder] - pub fn alter_assets(&mut self, op: AssetsOp) -> &mut Self { - self.context.alter_assets(op); + pub fn set_assets(&mut self, op: AssetsOp) -> &mut Self { + self.context.set_assets(op); self } #[fn_builder] - pub fn alter_body_id(&mut self, id: impl Into) -> &mut Self { - self.body_id.alter_value(id); + pub fn set_body_id(&mut self, id: impl Into) -> &mut Self { + self.body_id.set_value(id); self } #[fn_builder] - pub fn alter_body_classes(&mut self, op: ClassesOp, classes: impl Into) -> &mut Self { - self.body_classes.alter_value(op, classes); + pub fn set_body_classes(&mut self, op: ClassesOp, classes: impl Into) -> &mut Self { + self.body_classes.set_value(op, classes); self } #[fn_builder] - pub fn alter_body_skip_to(&mut self, id: impl Into) -> &mut Self { - self.body_skip_to.alter_value(id); + pub fn set_body_skip_to(&mut self, id: impl Into) -> &mut Self { + self.body_skip_to.set_value(id); self } #[fn_builder] - pub fn alter_layout(&mut self, layout: &'static str) -> &mut Self { - self.context.alter_assets(AssetsOp::Layout(layout)); + pub fn set_layout(&mut self, layout: &'static str) -> &mut Self { + self.context.set_assets(AssetsOp::Layout(layout)); self } #[fn_builder] - pub fn alter_regions(&mut self, region: &'static str, op: AnyOp) -> &mut Self { - self.context.alter_regions(region, op); + pub fn set_regions(&mut self, region: &'static str, op: AnyOp) -> &mut Self { + self.context.set_regions(region, op); self } pub fn with_component(mut self, component: impl ComponentTrait) -> Self { self.context - .alter_regions("content", AnyOp::Add(AnyComponent::with(component))); + .set_regions("content", AnyOp::Add(AnyComponent::with(component))); self } @@ -123,7 +123,7 @@ impl Page { component: impl ComponentTrait, ) -> Self { self.context - .alter_regions(region, AnyOp::Add(AnyComponent::with(component))); + .set_regions(region, AnyOp::Add(AnyComponent::with(component))); self }