change names for member crates

Author: GodGotzi

Cargo.toml

@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-parser = { version = "*", path = "parser" }
-macros = { version = "*", path = "macros" }
+egui_xml_parser = { version = "*", path = "parser" }
+egui_xml_macros = { version = "*", path = "macros" }
 egui_extras = "0.27"
 
 [dev-dependencies]

examples/file.rs

@@ -1,5 +1,5 @@
 use eframe::egui;
-use macros::load_layout_file;
+use egui_xml::load_layout_file;
 
 fn main() -> Result<(), eframe::Error> {
     let options = eframe::NativeOptions {

macros/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "macros"
+name = "egui_xml_macros"
 version = "0.1.0"
 edition = "2021"
 
@@ -11,6 +11,6 @@ syn = "2.0"
 quote = "1.0"
 quote_into = "0.2.0"
 proc-macro2 = "1.0"
-parser = { path = "../parser" }
+egui_xml_parser = { path = "../parser" }
 strum_macros = "0.26"
 strum = "0.26"

macros/src/layout/strip.rs

@@ -5,7 +5,7 @@ use std::{
     str::{from_utf8, FromStr},
 };
 
-use parser::{
+use egui_xml_parser::{
     attribute::{parse_optional_hybrid_attribute, AttributeBool, AttributeF32, HybridAttribute},
     Node,
 };
@@ -18,7 +18,9 @@ use strum_macros::EnumString;
 
 use crate::XMLContext;
 
-use parser::attribute::{parse_hybrid_attribute, parse_optional_rust_attribute, parse_string};
+use egui_xml_parser::attribute::{
+    parse_hybrid_attribute, parse_optional_rust_attribute, parse_string,
+};
 
 #[derive(PartialEq, Eq, EnumString)]
 enum DirectionBlueprint {

macros/src/lib.rs

@@ -29,8 +29,8 @@ extern crate proc_macro;
 
 use std::{cell::RefCell, rc::Rc};
 
+use egui_xml_parser::{Node, XMLForm};
 use layout::strip::expand_strip;
-use parser::{Node, XMLForm};
 use proc_macro::TokenStream;
 
 use quote::{quote, TokenStreamExt};
@@ -59,12 +59,12 @@ fn expand_node(
     ctx: &XMLContext,
 ) -> Result<proc_macro2::TokenStream, String> {
     match &*node.borrow() {
-        parser::Node::Panel { children, .. } => expand_nodes(children, ctx),
-        parser::Node::Rust { code, .. } => Ok(code.parse().unwrap()),
-        parser::Node::Border { .. } => Ok(quote! {}),
-        parser::Node::Grid { .. } => Ok(quote! {}),
-        parser::Node::Default { children, .. } => expand_nodes(children, ctx),
-        parser::Node::Strip { .. } => expand_strip(node, ctx),
+        egui_xml_parser::Node::Panel { children, .. } => expand_nodes(children, ctx),
+        egui_xml_parser::Node::Rust { code, .. } => Ok(code.parse().unwrap()),
+        egui_xml_parser::Node::Border { .. } => Ok(quote! {}),
+        egui_xml_parser::Node::Grid { .. } => Ok(quote! {}),
+        egui_xml_parser::Node::Default { children, .. } => expand_nodes(children, ctx),
+        egui_xml_parser::Node::Strip { .. } => expand_strip(node, ctx),
     }
 }
 

parser/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "parser"
+name = "egui_xml_parser"
 version = "0.1.0"
 edition = "2021"
 

parser/test1.fmt

@@ -1,2 +1,2 @@
-pub use macros::load_layout;
-pub use macros::load_layout_file;
+pub use egui_xml_macros::load_layout;
+pub use egui_xml_macros::load_layout_file;