Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename IntoAnyElement trait to Component

Browse source
This commit is contained in:
Nathan Sobo 2023-10-26 12:46:52 +02:00
parent 8ecfea55cd
commit 0285284ae1
60 changed files with 297 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/gpui2_macros/src/derive_into_any_element.rs → crates/gpui2_macros/src/derive_component.rs
View file

@ -2,7 +2,7 @@ use proc_macro::TokenStream;
use quote::quote;
use syn::{parse_macro_input, DeriveInput};
pub fn derive_into_any_element(input: TokenStream) -> TokenStream {
pub fn derive_component(input: TokenStream) -> TokenStream {
let ast = parse_macro_input!(input as DeriveInput);
let name = &ast.ident;
let generics = &ast.generics;
@ -11,7 +11,7 @@ pub fn derive_into_any_element(input: TokenStream) -> TokenStream {
let specified_view_type = ast
.attrs
.iter()
.find(|attr| attr.path.is_ident("element"))
.find(|attr| attr.path.is_ident("component"))
.and_then(|attr| {
if let Ok(syn::Meta::List(meta_list)) = attr.parse_meta() {
meta_list.nested.iter().find_map(|nested| {
@ -42,10 +42,10 @@ pub fn derive_into_any_element(input: TokenStream) -> TokenStream {
});
let expanded = quote! {
impl #impl_generics gpui2::IntoAnyElement<#view_type> for #name #ty_generics #where_clause {
fn into_any(self) -> gpui2::AnyElement<#view_type> {
impl #impl_generics gpui2::Component<#view_type> for #name #ty_generics #where_clause {
fn render(self) -> gpui2::AnyElement<#view_type> {
(move |view_state: &mut #view_type, cx: &mut gpui2::ViewContext<'_, '_, #view_type>| self.render(view_state, cx))
.into_any()
.render()
}
}
};

8
crates/gpui2_macros/src/gpui2_macros.rs
View file

@ -1,6 +1,6 @@
use proc_macro::TokenStream;
mod derive_into_any_element;
mod derive_component;
mod style_helpers;
mod test;
@ -9,9 +9,9 @@ pub fn style_helpers(args: TokenStream) -> TokenStream {
style_helpers::style_helpers(args)
}
#[proc_macro_derive(IntoAnyElement, attributes(element))]
pub fn derive_into_any_element(input: TokenStream) -> TokenStream {
derive_into_any_element::derive_into_any_element(input)
#[proc_macro_derive(Component, attributes(component))]
pub fn derive_component(input: TokenStream) -> TokenStream {
derive_component::derive_component(input)
}
#[proc_macro_attribute]