From df0b2eeb7119a03bd629296687e6b038ac5ecbb0 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sun, 13 Aug 2023 10:27:59 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Enhance=20function-associated=20?= =?UTF-8?q?type=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagetop/src/core/component/renderable.rs | 4 ++-- pagetop/src/response/page/action.rs | 2 +- pagetop/src/response/page/action/after_prepare_body.rs | 6 +++--- pagetop/src/response/page/action/before_prepare_body.rs | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pagetop/src/core/component/renderable.rs b/pagetop/src/core/component/renderable.rs index bac3e384..3c105918 100644 --- a/pagetop/src/core/component/renderable.rs +++ b/pagetop/src/core/component/renderable.rs @@ -1,9 +1,9 @@ use crate::core::component::Context; -pub type IsRenderable = fn(cx: &Context) -> bool; +pub type FnIsRenderable = fn(cx: &Context) -> bool; pub struct Renderable { - pub check: IsRenderable, + pub check: FnIsRenderable, } impl Default for Renderable { diff --git a/pagetop/src/response/page/action.rs b/pagetop/src/response/page/action.rs index b61bc895..d3a81011 100644 --- a/pagetop/src/response/page/action.rs +++ b/pagetop/src/response/page/action.rs @@ -1,6 +1,6 @@ use crate::response::page::Page; -pub type ActionPage = fn(page: &mut Page); +pub type FnActionPage = fn(page: &mut Page); mod before_prepare_body; pub use before_prepare_body::*; diff --git a/pagetop/src/response/page/action/after_prepare_body.rs b/pagetop/src/response/page/action/after_prepare_body.rs index ff74cedc..457a17db 100644 --- a/pagetop/src/response/page/action/after_prepare_body.rs +++ b/pagetop/src/response/page/action/after_prepare_body.rs @@ -1,12 +1,12 @@ use crate::core::action::{action_ref, run_actions, ActionTrait}; -use crate::response::page::action::ActionPage; +use crate::response::page::action::FnActionPage; use crate::response::page::Page; use crate::{new_handle, Handle, Weight}; new_handle!(ACTION_AFTER_PREPARE_BODY for Action); pub struct ActionAfterPrepareBody { - action: Option, + action: Option, weight: Weight, } @@ -28,7 +28,7 @@ impl ActionTrait for ActionAfterPrepareBody { } impl ActionAfterPrepareBody { - pub fn with_action(mut self, action: ActionPage) -> Self { + pub fn with_action(mut self, action: FnActionPage) -> Self { self.action = Some(action); self } diff --git a/pagetop/src/response/page/action/before_prepare_body.rs b/pagetop/src/response/page/action/before_prepare_body.rs index 715d8378..e5622567 100644 --- a/pagetop/src/response/page/action/before_prepare_body.rs +++ b/pagetop/src/response/page/action/before_prepare_body.rs @@ -1,12 +1,12 @@ use crate::core::action::{action_ref, run_actions, ActionTrait}; -use crate::response::page::action::ActionPage; +use crate::response::page::action::FnActionPage; use crate::response::page::Page; use crate::{new_handle, Handle, Weight}; new_handle!(ACTION_BEFORE_PREPARE_BODY for Action); pub struct ActionBeforePrepareBody { - action: Option, + action: Option, weight: Weight, } @@ -28,7 +28,7 @@ impl ActionTrait for ActionBeforePrepareBody { } impl ActionBeforePrepareBody { - pub fn with_action(mut self, action: ActionPage) -> Self { + pub fn with_action(mut self, action: FnActionPage) -> Self { self.action = Some(action); self }