From 8dbbafdec678bc67abaa876ebb1523c54c085fca Mon Sep 17 00:00:00 2001 From: Louis <contact@louiscap.co> Date: Fri, 21 Feb 2025 07:22:59 +0000 Subject: [PATCH] Remove Kayak derive --- CHANGELOG.md | 9 +++++++++ Cargo.toml | 4 ---- src/fqpath.rs | 3 --- src/kayak/mod.rs | 3 --- src/kayak/widget.rs | 12 ------------ src/lib.rs | 9 --------- 6 files changed, 9 insertions(+), 31 deletions(-) create mode 100644 CHANGELOG.md delete mode 100644 src/kayak/mod.rs delete mode 100644 src/kayak/widget.rs diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..a574192 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,9 @@ +[0.7.0] + +### Changed + +- Required Bevy version is now 0.15 + +### Removed + +- Removed `KayakWidget` derive \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 8c8466f..a6355c6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,10 +11,6 @@ name = "micro_games_macros" path = "src/lib.rs" proc-macro = true -[features] -default = ["kayak"] -kayak = [] - [dependencies] proc-macro2 = "1.0" quote = "1.0" diff --git a/src/fqpath.rs b/src/fqpath.rs index 5442aed..4d02df4 100644 --- a/src/fqpath.rs +++ b/src/fqpath.rs @@ -69,6 +69,3 @@ fq!(BevyAsyncRead => ::bevy::asset::AsyncReadExt); fq!(BevyAssetReader => ::bevy::asset::io::Reader); fq!(send_event => ::micro_bevy_world_utils::send_event); - -#[cfg(feature = "kayak")] -fq!(KayakWidget => ::kayak_ui::prelude::Widget); diff --git a/src/kayak/mod.rs b/src/kayak/mod.rs deleted file mode 100644 index 6377be4..0000000 --- a/src/kayak/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -mod widget; - -pub use widget::derive_widget; diff --git a/src/kayak/widget.rs b/src/kayak/widget.rs deleted file mode 100644 index a3fd7ba..0000000 --- a/src/kayak/widget.rs +++ /dev/null @@ -1,12 +0,0 @@ -use proc_macro2::TokenStream; -use quote::quote; -use syn::DeriveInput; - -use crate::fqpath::*; - -pub fn derive_widget(DeriveInput { ident, .. }: DeriveInput) -> TokenStream { - quote! { - #[automatically_derived] - impl #KayakWidget for #ident {} - } -} diff --git a/src/lib.rs b/src/lib.rs index 7a1f6cb..c6e8e36 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -101,8 +101,6 @@ pub(crate) mod utils; pub(crate) mod asset_system; pub(crate) mod event_system; pub(crate) mod json_loader; -#[cfg(feature = "kayak")] -pub(crate) mod kayak; pub(crate) mod std_traits; pub(crate) mod tag_finder; @@ -323,13 +321,6 @@ pub fn loader_property(_: TokenStream, input: TokenStream) -> TokenStream { input } -#[proc_macro_derive(Widget)] -#[cfg(feature = "kayak")] -pub fn derive_kayak_wigdet(input: TokenStream) -> TokenStream { - let input = parse_macro_input!(input as DeriveInput); - kayak::derive_widget(input).into() -} - /// Derive [std::convert::From] for single property tuple or named struct types /// /// ## Examples -- GitLab