From dc4210bcb8805d3849d487d4e1263d9f692f6d26 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Mon, 20 Nov 2023 20:37:03 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20macro=20AssignHandle=20?= =?UTF-8?q?to=20BindHandle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- drust/src/main.rs | 2 +- examples/basics/hello-name/src/main.rs | 2 +- examples/basics/hello-world/src/main.rs | 2 +- pagetop-admin/src/lib.rs | 2 +- pagetop-bootsier/src/lib.rs | 2 +- pagetop-bulmix/src/lib.rs | 2 +- pagetop-homedemo/src/lib.rs | 2 +- pagetop-macros/src/lib.rs | 4 ++-- pagetop-node/src/lib.rs | 2 +- pagetop-user/src/lib.rs | 2 +- pagetop/src/lib.rs | 4 ++-- pagetop/src/prelude.rs | 2 +- pagetop/tests/server/health_check.rs | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drust/src/main.rs b/drust/src/main.rs index 87973883..76eb9426 100644 --- a/drust/src/main.rs +++ b/drust/src/main.rs @@ -1,6 +1,6 @@ use pagetop::prelude::*; -#[derive(AssignHandle)] +#[derive(BindHandle)] struct Drust; impl ModuleTrait for Drust { diff --git a/examples/basics/hello-name/src/main.rs b/examples/basics/hello-name/src/main.rs index 03bef647..9670965e 100644 --- a/examples/basics/hello-name/src/main.rs +++ b/examples/basics/hello-name/src/main.rs @@ -1,6 +1,6 @@ use pagetop::prelude::*; -#[derive(AssignHandle)] +#[derive(BindHandle)] struct HelloName; impl ModuleTrait for HelloName { diff --git a/examples/basics/hello-world/src/main.rs b/examples/basics/hello-world/src/main.rs index 788da31a..50f61973 100644 --- a/examples/basics/hello-world/src/main.rs +++ b/examples/basics/hello-world/src/main.rs @@ -1,6 +1,6 @@ use pagetop::prelude::*; -#[derive(AssignHandle)] +#[derive(BindHandle)] struct HelloWorld; impl ModuleTrait for HelloWorld { diff --git a/pagetop-admin/src/lib.rs b/pagetop-admin/src/lib.rs index acf69fa6..26c66c66 100644 --- a/pagetop-admin/src/lib.rs +++ b/pagetop-admin/src/lib.rs @@ -4,7 +4,7 @@ static_locales!(LOCALES_ADMIN); mod summary; -#[derive(AssignHandle)] +#[derive(BindHandle)] pub struct Admin; impl ModuleTrait for Admin { diff --git a/pagetop-bootsier/src/lib.rs b/pagetop-bootsier/src/lib.rs index 52c52e4b..87bfebd9 100644 --- a/pagetop-bootsier/src/lib.rs +++ b/pagetop-bootsier/src/lib.rs @@ -4,7 +4,7 @@ static_locales!(LOCALES_BOOTSIER); static_files!(bootsier); -#[derive(AssignHandle)] +#[derive(BindHandle)] pub struct Bootsier; impl ModuleTrait for Bootsier { diff --git a/pagetop-bulmix/src/lib.rs b/pagetop-bulmix/src/lib.rs index 123facc9..79294c2b 100644 --- a/pagetop-bulmix/src/lib.rs +++ b/pagetop-bulmix/src/lib.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; static_files!(bulmix); -#[derive(AssignHandle)] +#[derive(BindHandle)] pub struct Bulmix; impl ModuleTrait for Bulmix { diff --git a/pagetop-homedemo/src/lib.rs b/pagetop-homedemo/src/lib.rs index 765620c0..4b645c5b 100644 --- a/pagetop-homedemo/src/lib.rs +++ b/pagetop-homedemo/src/lib.rs @@ -4,7 +4,7 @@ static_locales!(LOCALES_HOMEDEMO); static_files!(homedemo); -#[derive(AssignHandle)] +#[derive(BindHandle)] pub struct HomeDemo; impl ModuleTrait for HomeDemo { diff --git a/pagetop-macros/src/lib.rs b/pagetop-macros/src/lib.rs index ec1f9dfa..0b5b3cd1 100644 --- a/pagetop-macros/src/lib.rs +++ b/pagetop-macros/src/lib.rs @@ -128,8 +128,8 @@ pub fn base_handle_derive(input: TokenStream) -> TokenStream { impl_handle(input, quote! { crate }) } -#[proc_macro_derive(AssignHandle, attributes(handle))] -pub fn assign_handle_derive(input: TokenStream) -> TokenStream { +#[proc_macro_derive(BindHandle, attributes(handle))] +pub fn bind_handle_derive(input: TokenStream) -> TokenStream { impl_handle(input, quote! { pagetop }) } diff --git a/pagetop-node/src/lib.rs b/pagetop-node/src/lib.rs index 9201f5d8..f994a696 100644 --- a/pagetop-node/src/lib.rs +++ b/pagetop-node/src/lib.rs @@ -5,7 +5,7 @@ static_locales!(LOCALES_NODE); //mod entity; mod migration; -#[derive(AssignHandle)] +#[derive(BindHandle)] pub struct Node; impl ModuleTrait for Node { diff --git a/pagetop-user/src/lib.rs b/pagetop-user/src/lib.rs index 726b3cd1..b273495c 100644 --- a/pagetop-user/src/lib.rs +++ b/pagetop-user/src/lib.rs @@ -4,7 +4,7 @@ static_locales!(LOCALES_USER); mod migration; -#[derive(AssignHandle)] +#[derive(BindHandle)] pub struct User; impl ModuleTrait for User { diff --git a/pagetop/src/lib.rs b/pagetop/src/lib.rs index c3d71e96..7fc3d7a7 100644 --- a/pagetop/src/lib.rs +++ b/pagetop/src/lib.rs @@ -44,7 +44,7 @@ //! ```rust //! use pagetop::prelude::*; //! -//! #[derive(AssignHandle)] +//! #[derive(BindHandle)] //! struct HelloWorld; //! //! impl ModuleTrait for HelloWorld { @@ -108,7 +108,7 @@ pub use paste::paste; /// customized default values. pub use smart_default::SmartDefault; -pub use pagetop_macros::{fn_builder, main, test, AssignHandle, ComponentClasses}; +pub use pagetop_macros::{fn_builder, main, test, BindHandle, ComponentClasses}; pub(crate) use pagetop_macros::BaseHandle; diff --git a/pagetop/src/prelude.rs b/pagetop/src/prelude.rs index ee6e9b2e..9c2d949c 100644 --- a/pagetop/src/prelude.rs +++ b/pagetop/src/prelude.rs @@ -8,7 +8,7 @@ pub use crate::{Handle, HashMapResources, ImplementHandle, LazyStatic, Weight}; // Functions and macro helpers. pub use crate::util; -pub use crate::{kv, AssignHandle, ComponentClasses}; +pub use crate::{kv, BindHandle, ComponentClasses}; // MACROS. diff --git a/pagetop/tests/server/health_check.rs b/pagetop/tests/server/health_check.rs index ba3df6de..0d3543ae 100644 --- a/pagetop/tests/server/health_check.rs +++ b/pagetop/tests/server/health_check.rs @@ -1,6 +1,6 @@ use pagetop::prelude::*; -#[derive(AssignHandle)] +#[derive(BindHandle)] struct HealthCheck; impl ModuleTrait for HealthCheck {}