Added AttrNames to Column & Row

Author: ZhukMax

efx-attrnames/Cargo.toml

@@ -11,5 +11,4 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0"
-proc-macro2 = "1.0"
 syn = { version = "2.0", features = ["full"] }

efx-attrnames/src/lib.rs

@@ -2,7 +2,7 @@
 
 use proc_macro::TokenStream;
 use quote::quote;
-use syn::{parse_macro_input, DeriveInput, Data, Fields, Meta, Lit, LitStr};
+use syn::{Data, DeriveInput, Fields, LitStr, parse_macro_input};
 
 /// Derive for generating `ATTR_NAMES` constant for attribute structure.
 /// Supports field renaming via `#[attr(name = "align")]`.
@@ -20,17 +20,14 @@ pub fn derive_attr_names(input: TokenStream) -> TokenStream {
                     &st.fields,
                     "AttrNames supports only structs with named fields",
                 )
-                    .to_compile_error()
-                    .into()
+                .to_compile_error()
+                .into();
             }
         },
         _ => {
-            return syn::Error::new_spanned(
-                &input.ident,
-                "AttrNames supports only structs",
-            )
+            return syn::Error::new_spanned(&input.ident, "AttrNames supports only structs")
                 .to_compile_error()
-                .into()
+                .into();
         }
     };
 
@@ -41,12 +38,9 @@ pub fn derive_attr_names(input: TokenStream) -> TokenStream {
         let ident = match &f.ident {
             Some(id) => id,
             None => {
-                return syn::Error::new_spanned(
-                    f,
-                    "expected named field",
-                )
+                return syn::Error::new_spanned(f, "expected named field")
                     .to_compile_error()
-                    .into()
+                    .into();
             }
         };
 

efx/src/lib.rs

@@ -18,7 +18,7 @@ use crate::buffer::build_buffer_from_children;
 use crate::input::EfxInput;
 use crate::render::render_nodes_as_stmts;
 use crate::tags::button::render_button;
-use efx_core::{parse_str, Node};
+use efx_core::{Node, parse_str};
 
 /// Functional procedural macro `efx!` - parses compact XML-like markup
 /// and executes it against the passed UI context.

efx/src/render.rs

@@ -1,6 +1,6 @@
-use proc_macro2::TokenStream;
 use crate::tags::*;
 use efx_core::{Element, Node};
+use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
 
 pub(crate) fn render_nodes_as_stmts<UI: ToTokens>(
@@ -64,7 +64,7 @@ fn render_element_stmt<UI: ToTokens>(ui: &UI, el: &Element) -> proc_macro2::Toke
 
 fn render_tag<T: Tag>(ui: &impl ToTokens, el: &Element) -> TokenStream {
     match T::from_element(el) {
-        Ok(tag)  => tag.render(ui),
+        Ok(tag) => tag.render(ui),
         Err(err) => err,
     }
 }

efx/src/tags/column.rs

@@ -1,6 +1,6 @@
 use efx_core::Element;
 use proc_macro2::TokenStream;
-use quote::{quote, ToTokens};
+use quote::{ToTokens, quote};
 
 use crate::render::render_nodes_as_stmts;
 use crate::tags::util::{attr_map, f32_opt};

efx/src/tags/row.rs

@@ -1,7 +1,7 @@
 use efx_core::Element;
 use proc_macro2::TokenStream;
-use quote::{quote, ToTokens};
-
+use quote::{ToTokens, quote};
+use efx_attrnames::AttrNames;
 use crate::render::render_nodes_as_stmts;
 use crate::tags::util::{attr_map, bool_or, f32_opt};
 use crate::tags::{Tag, TagAttributes};
@@ -90,7 +90,7 @@ impl Row {
     }
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, AttrNames)]
 struct Attributes {
     gap: Option<f32>,
     padding: Option<f32>,
@@ -100,8 +100,7 @@ struct Attributes {
 
 impl TagAttributes for Attributes {
     fn new(el: &Element) -> Result<Self, TokenStream> {
-        const KNOWN: &[&str] = &["gap", "padding", "align", "wrap"];
-        let map = match attr_map(el, KNOWN, "Row") {
+        let map = match attr_map(el, Attributes::ATTR_NAMES, "Row") {
             Ok(m) => m,
             Err(err) => return Err(err),
         };