Added Utils module

ZhukMax · ZhukMax · commit fff4e31ce1fb · 2025-08-31T00:52:05.000+02:00
diff --git a/efx/src/lib.rs b/efx/src/lib.rs
@@ -5,16 +5,15 @@
 #![doc = include_str!("../docs/guide.md")]
 
 mod attr_adapters;
-mod buffer;
 mod input;
 mod render;
 mod tags;
+mod utils;
 
 use proc_macro::TokenStream;
 use quote::quote;
 use syn::parse_macro_input;
 
-use crate::buffer::build_buffer_from_children;
 use crate::input::EfxInput;
 use crate::render::render_nodes_as_stmts;
 use crate::tags::Button;
diff --git a/efx/src/tags/button.rs b/efx/src/tags/button.rs
@@ -1,10 +1,10 @@
-use crate::buffer::build_buffer_from_children;
-use crate::tags::util::*;
 use crate::tags::{Tag, TagAttributes};
 use efx_attrnames::AttrNames;
 use efx_core::Element;
 use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
+use crate::utils::attr::*;
+use crate::utils::buffer::build_buffer_from_children;
 
 pub struct Button {
     attributes: Attributes,
diff --git a/efx/src/tags/central_panel.rs b/efx/src/tags/central_panel.rs
@@ -1,9 +1,10 @@
-use crate::tags::util::*;
 use crate::tags::{Tag, TagAttributes};
 use efx_attrnames::AttrNames;
 use efx_core::Element;
 use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
+use crate::utils::attr::*;
+use crate::utils::render::render_children_stmt;
 
 pub struct CentralPanel {
     attributes: Attributes,
diff --git a/efx/src/tags/column.rs b/efx/src/tags/column.rs
@@ -3,9 +3,9 @@ use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
 
 use crate::render::render_nodes_as_stmts;
-use crate::tags::util::{attr_map, f32_opt};
 use crate::tags::{Block, TagAttributes};
 use efx_attrnames::AttrNames;
+use crate::utils::attr::*;
 
 pub struct Column {
     attributes: Attributes,
diff --git a/efx/src/tags/hyperlink.rs b/efx/src/tags/hyperlink.rs
@@ -1,10 +1,10 @@
-use crate::buffer::build_buffer_from_children;
-use crate::tags::util::*;
 use crate::tags::{Tag, TagAttributes};
 use efx_attrnames::AttrNames;
 use efx_core::Element;
 use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
+use crate::utils::attr::*;
+use crate::utils::buffer::build_buffer_from_children;
 
 /// <Hyperlink url="..." [open_external=bool] [color=...] [underline=bool] [tooltip=...]>text?</Hyperlink>
 pub struct Hyperlink {
diff --git a/efx/src/tags/label.rs b/efx/src/tags/label.rs
@@ -1,10 +1,10 @@
-use crate::build_buffer_from_children;
-use crate::tags::util::{attr_map, bool_opt, color_tokens_opt, f32_opt};
 use crate::tags::{Tag, TagAttributes};
 use efx_attrnames::AttrNames;
 use efx_core::Element;
 use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
+use crate::utils::attr::*;
+use crate::utils::buffer::build_buffer_from_children;
 
 pub struct Label {
     attributes: Attributes,
diff --git a/efx/src/tags/mod.rs b/efx/src/tags/mod.rs
@@ -7,7 +7,6 @@ pub mod row;
 pub mod scroll_area;
 pub mod separator;
 pub mod text_field;
-pub mod util;
 pub mod window;
 
 pub use button::Button;
diff --git a/efx/src/tags/row.rs b/efx/src/tags/row.rs
@@ -1,10 +1,10 @@
 use crate::render::render_nodes_as_stmts;
-use crate::tags::util::{attr_map, bool_or, f32_opt};
 use crate::tags::{Block, TagAttributes};
 use efx_attrnames::AttrNames;
 use efx_core::Element;
 use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
+use crate::utils::attr::*;
 
 pub struct Row {
     attributes: Attributes,
diff --git a/efx/src/tags/scroll_area.rs b/efx/src/tags/scroll_area.rs
@@ -1,9 +1,10 @@
-use crate::tags::util::*;
 use crate::tags::{Tag, TagAttributes};
 use efx_attrnames::AttrNames;
 use efx_core::Element;
 use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
+use crate::utils::attr::*;
+use crate::utils::render::render_children_stmt;
 
 pub struct ScrollArea {
     attributes: Attributes,
diff --git a/efx/src/tags/separator.rs b/efx/src/tags/separator.rs
@@ -1,9 +1,9 @@
-use crate::tags::util::{attr_map, f32_opt};
 use crate::tags::{Block, TagAttributes};
 use efx_attrnames::AttrNames;
 use efx_core::Element;
 use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
+use crate::utils::attr::*;
 
 pub struct Separator {
     attributes: Attributes,
diff --git a/efx/src/tags/text_field.rs b/efx/src/tags/text_field.rs
@@ -1,10 +1,11 @@
-use crate::tags::util::*;
 use crate::tags::{Tag, TagAttributes};
 use efx_attrnames::AttrNames;
 use efx_core::Element;
 use proc_macro2::TokenStream;
 use quote::{ToTokens, quote};
 use syn::Expr;
+use crate::utils::attr::*;
+use crate::utils::expr::expr_req;
 
 pub struct TextField {
     attributes: Attributes,
diff --git a/efx/src/utils/attr.rs b/efx/src/utils/attr.rs
@@ -1,10 +1,11 @@
-use efx_core::{Element, Node};
-use proc_macro2::TokenStream;
-use quote::{ToTokens, quote};
 use std::collections::BTreeMap;
+use proc_macro2::TokenStream;
+use quote::quote;
+use efx_core::Element;
 
 use crate::attr_adapters as A;
 
+#[inline]
 pub fn attr_map<'a>(
     el: &'a Element,
     known: &[&str],
@@ -29,6 +30,7 @@ pub fn attr_map<'a>(
     Ok(out)
 }
 
+#[inline]
 pub fn bool_opt(map: &BTreeMap<&str, &str>, key: &str) -> Result<Option<bool>, TokenStream> {
     Ok(match map.get(key) {
         Some(v) => Some(A::parse_bool(key, v).map_err(|m| quote! { compile_error!(#m); })?),
@@ -53,6 +55,7 @@ pub fn f32_opt(map: &BTreeMap<&str, &str>, key: &str) -> Result<Option<f32>, Tok
     })
 }
 
+#[inline]
 pub fn u8_opt(map: &BTreeMap<&str, &str>, key: &str) -> Result<Option<u8>, TokenStream> {
     Ok(match map.get(key) {
         Some(v) => Some(A::parse_u8(key, v).map_err(|m| quote! { compile_error!(#m); })?),
@@ -100,66 +103,6 @@ pub fn margin_tokens(
     Some(quote!( egui::Margin { left: #l_ts, right: #r_ts, top: #t_ts, bottom: #b_ts } ))
 }
 
-pub fn render_children_stmt<UI: ToTokens>(ui_ident: &UI, children: &[Node]) -> TokenStream {
-    let mut out = TokenStream::new();
-    for ch in children {
-        let stmt = crate::render::render_node_stmt(&quote!(#ui_ident), ch);
-        out.extend(quote! { #stmt });
-    }
-    out
-}
-
-/// Required expression attribute: parses into syn::Expr.
-/// Returns `compile_error!` if the attribute is missing, empty, or not parsable.
-pub fn expr_req(
-    map: &BTreeMap<&str, &str>,
-    key: &str,
-    tag: &str,
-) -> Result<syn::Expr, TokenStream> {
-    let some = map.get(key).copied();
-    let src = match some {
-        Some(s) if !s.trim().is_empty() => s,
-        _ => {
-            let msg = format!("efx: <{}> requires `{}` attribute", tag, key);
-            return Err(quote! { compile_error!(#msg); });
-        }
-    };
-
-    match syn::parse_str::<syn::Expr>(src) {
-        Ok(e) => Ok(e),
-        Err(_) => {
-            let msg = format!(
-                "efx: attribute `{}` must be a valid Rust expression, got `{}`",
-                key, src
-            );
-            Err(quote! { compile_error!(#msg); })
-        }
-    }
-}
-
-#[allow(dead_code)]
-/// Optional expression attribute: `None` if absent; `compile_error!` if present but not parsed.
-pub fn expr_opt(map: &BTreeMap<&str, &str>, key: &str) -> Result<Option<syn::Expr>, TokenStream> {
-    match map.get(key) {
-        None => Ok(None),
-        Some(src) => {
-            if src.trim().is_empty() {
-                return Ok(None);
-            }
-            match syn::parse_str::<syn::Expr>(src) {
-                Ok(e) => Ok(Some(e)),
-                Err(_) => {
-                    let msg = format!(
-                        "efx: attribute `{}` must be a valid Rust expression, got `{}`",
-                        key, src
-                    );
-                    Err(quote! { compile_error!(#msg); })
-                }
-            }
-        }
-    }
-}
-
 /// Build `egui::Stroke` from optional width and color.
 /// Returns `None` if both parameters are missing.
 /// Numeric casts are done via `as _`, so as not to be limited to a specific type.
diff --git a/efx/src/utils/buffer.rs b/efx/src/utils/buffer.rs
@@ -1,12 +1,13 @@
-use efx_core::Node;
 use quote::quote;
+use efx_core::Node;
+use proc_macro2::TokenStream;
 
 pub fn build_buffer_from_children(
     children: &[Node],
-) -> (proc_macro2::TokenStream, proc_macro2::TokenStream) {
+) -> (TokenStream, TokenStream) {
     use efx_core::Node::*;
     let init = quote! { let mut __efx_buf = ::std::string::String::new(); };
-    let mut build = proc_macro2::TokenStream::new();
+    let mut build = TokenStream::new();
 
     for ch in children {
         match ch {
diff --git a/efx/src/utils/expr.rs b/efx/src/utils/expr.rs
@@ -0,0 +1,54 @@
+use std::collections::BTreeMap;
+use proc_macro2::TokenStream;
+use quote::quote;
+
+/// Required expression attribute: parses into syn::Expr.
+/// Returns `compile_error!` if the attribute is missing, empty, or not parsable.
+pub fn expr_req(
+    map: &BTreeMap<&str, &str>,
+    key: &str,
+    tag: &str,
+) -> Result<syn::Expr, TokenStream> {
+    let some = map.get(key).copied();
+    let src = match some {
+        Some(s) if !s.trim().is_empty() => s,
+        _ => {
+            let msg = format!("efx: <{}> requires `{}` attribute", tag, key);
+            return Err(quote! { compile_error!(#msg); });
+        }
+    };
+
+    match syn::parse_str::<syn::Expr>(src) {
+        Ok(e) => Ok(e),
+        Err(_) => {
+            let msg = format!(
+                "efx: attribute `{}` must be a valid Rust expression, got `{}`",
+                key, src
+            );
+            Err(quote! { compile_error!(#msg); })
+        }
+    }
+}
+
+#[allow(dead_code)]
+/// Optional expression attribute: `None` if absent; `compile_error!` if present but not parsed.
+pub fn expr_opt(map: &BTreeMap<&str, &str>, key: &str) -> Result<Option<syn::Expr>, TokenStream> {
+    match map.get(key) {
+        None => Ok(None),
+        Some(src) => {
+            if src.trim().is_empty() {
+                return Ok(None);
+            }
+            match syn::parse_str::<syn::Expr>(src) {
+                Ok(e) => Ok(Some(e)),
+                Err(_) => {
+                    let msg = format!(
+                        "efx: attribute `{}` must be a valid Rust expression, got `{}`",
+                        key, src
+                    );
+                    Err(quote! { compile_error!(#msg); })
+                }
+            }
+        }
+    }
+}
diff --git a/efx/src/utils/mod.rs b/efx/src/utils/mod.rs
@@ -0,0 +1,4 @@
+pub mod buffer;
+pub mod attr;
+pub mod render;
+pub mod expr;
diff --git a/efx/src/utils/render.rs b/efx/src/utils/render.rs
@@ -0,0 +1,12 @@
+use proc_macro2::TokenStream;
+use quote::{quote, ToTokens};
+use efx_core::Node;
+
+pub fn render_children_stmt<UI: ToTokens>(ui_ident: &UI, children: &[Node]) -> TokenStream {
+    let mut out = TokenStream::new();
+    for ch in children {
+        let stmt = crate::render::render_node_stmt(&quote!(#ui_ident), ch);
+        out.extend(quote! { #stmt });
+    }
+    out
+}
