diff --git a/crates/crunch-codegen/src/lib.rs b/crates/crunch-codegen/src/lib.rs index cf6b4e4..353a28b 100644 --- a/crates/crunch-codegen/src/lib.rs +++ b/crates/crunch-codegen/src/lib.rs @@ -62,9 +62,7 @@ impl Node { } quote! { - pub mod $(&self.segment) { - $(for tokens in child_tokens join ($['\r']) => $tokens) - } + $(for tokens in child_tokens join ($['\r']) => $tokens) } } diff --git a/examples/basic-setup/src/gencrunch/mod.rs b/examples/basic-setup/src/gencrunch/mod.rs index f1ad8fa..c3bf297 100644 --- a/examples/basic-setup/src/gencrunch/mod.rs +++ b/examples/basic-setup/src/gencrunch/mod.rs @@ -1,54 +1,25 @@ -pub mod root { - pub mod basic { - pub mod includes { - pub mod my_include { - use prost::Message; - include!("basic.includes.my_include.rs"); - impl ::crunch::traits::Serializer for MyInclude { - fn serialize(&self) -> Result, ::crunch::errors::SerializeError> { - Ok(self.encode_to_vec()) - } - } - impl ::crunch::traits::Deserializer for MyInclude { - fn deserialize(raw: Vec) -> Result - where - Self: Sized, - { - let output = Self::decode(raw.as_slice()).map_err(|e| ::crunch::errors::DeserializeError::ProtoErr(e))?; - Ok(output) - } - } - - impl crunch::traits::Event for MyInclude { - fn event_info() -> ::crunch::traits::EventInfo { - ::crunch::traits::EventInfo { - domain: "my-domain", - entity_type: "my-entity-type", - event_name: "my-event-name", - } - } - } - } - } - pub mod my_event { +pub mod basic { + pub mod includes { + pub mod my_include { use prost::Message; - include!("basic.my_event.rs"); - impl ::crunch::traits::Serializer for MyEvent { + include!("basic.includes.my_include.rs"); + impl ::crunch::traits::Serializer for MyInclude { fn serialize(&self) -> Result, ::crunch::errors::SerializeError> { Ok(self.encode_to_vec()) } } - impl ::crunch::traits::Deserializer for MyEvent { + impl ::crunch::traits::Deserializer for MyInclude { fn deserialize(raw: Vec) -> Result where Self: Sized, { - let output = Self::decode(raw.as_slice()).map_err(|e| ::crunch::errors::DeserializeError::ProtoErr(e))?; + let output = Self::decode(raw.as_slice()) + .map_err(|e| ::crunch::errors::DeserializeError::ProtoErr(e))?; Ok(output) } } - impl crunch::traits::Event for MyEvent { + impl crunch::traits::Event for MyInclude { fn event_info() -> ::crunch::traits::EventInfo { ::crunch::traits::EventInfo { domain: "my-domain", @@ -59,32 +30,62 @@ pub mod root { } } } - pub mod examples { - pub mod example { - use prost::Message; - include!("examples.example.rs"); - impl ::crunch::traits::Serializer for MyEvent { - fn serialize(&self) -> Result, ::crunch::errors::SerializeError> { - Ok(self.encode_to_vec()) - } + pub mod my_event { + use prost::Message; + include!("basic.my_event.rs"); + impl ::crunch::traits::Serializer for MyEvent { + fn serialize(&self) -> Result, ::crunch::errors::SerializeError> { + Ok(self.encode_to_vec()) } - impl ::crunch::traits::Deserializer for MyEvent { - fn deserialize(raw: Vec) -> Result - where - Self: Sized, - { - let output = Self::decode(raw.as_slice()).map_err(|e| ::crunch::errors::DeserializeError::ProtoErr(e))?; - Ok(output) - } + } + impl ::crunch::traits::Deserializer for MyEvent { + fn deserialize(raw: Vec) -> Result + where + Self: Sized, + { + let output = Self::decode(raw.as_slice()) + .map_err(|e| ::crunch::errors::DeserializeError::ProtoErr(e))?; + Ok(output) } + } - impl crunch::traits::Event for MyEvent { - fn event_info() -> ::crunch::traits::EventInfo { - ::crunch::traits::EventInfo { - domain: "my-domain", - entity_type: "my-entity-type", - event_name: "my-event-name", - } + impl crunch::traits::Event for MyEvent { + fn event_info() -> ::crunch::traits::EventInfo { + ::crunch::traits::EventInfo { + domain: "my-domain", + entity_type: "my-entity-type", + event_name: "my-event-name", + } + } + } + } +} +pub mod examples { + pub mod example { + use prost::Message; + include!("examples.example.rs"); + impl ::crunch::traits::Serializer for MyEvent { + fn serialize(&self) -> Result, ::crunch::errors::SerializeError> { + Ok(self.encode_to_vec()) + } + } + impl ::crunch::traits::Deserializer for MyEvent { + fn deserialize(raw: Vec) -> Result + where + Self: Sized, + { + let output = Self::decode(raw.as_slice()) + .map_err(|e| ::crunch::errors::DeserializeError::ProtoErr(e))?; + Ok(output) + } + } + + impl crunch::traits::Event for MyEvent { + fn event_info() -> ::crunch::traits::EventInfo { + ::crunch::traits::EventInfo { + domain: "my-domain", + entity_type: "my-entity-type", + event_name: "my-event-name", } } }