Return single statement from generateEncode()

2 files changed, 15 insertions, 33 deletions

diff --git a/examples/10-transient-0/output/rust/src/gen/data/transient_0.rs b/examples/10-transient-0/output/rust/src/gen/data/transient_0.rs
index 0ea3f6f..e32d42f 100644
--- a/examples/10-transient-0/output/rust/src/gen/data/transient_0.rs
+++ b/examples/10-transient-0/output/rust/src/gen/data/transient_0.rs
@@ -75,15 +75,15 @@ pub fn decode_inner_struct(reader: &mut impl std::io::Read) -> ::std::io::Result
 pub fn encode_struct_with_list(value: &crate::data::StructWithList, writer: &mut impl std::io::Write) -> ::std::io::Result::<()> {
     {
         crate::transient_0::encode_int_64(&(((&value.a).len()).try_into()).unwrap(), writer)?;
-    };
-    for element in &value.a {
-        crate::transient_0::encode_int_64(element, writer)?;
+        for element in &value.a {
+            crate::transient_0::encode_int_64(element, writer)?;
+        };
     };
     {
         crate::transient_0::encode_int_64(&(((&value.b).len()).try_into()).unwrap(), writer)?;
-    };
-    for element in &value.b {
-        crate::data::transient_0::encode_inner_struct(element, writer)?;
+        for element in &value.b {
+            crate::data::transient_0::encode_inner_struct(element, writer)?;
+        };
     };
     ::std::io::Result::Ok(())
 }
@@ -110,22 +110,14 @@ pub fn decode_struct_with_list(reader: &mut impl std::io::Read) -> ::std::io::Re
 
 pub fn encode_struct_with_option(value: &crate::data::StructWithOption, writer: &mut impl std::io::Write) -> ::std::io::Result::<()> {
     if (&value.a).is_some() {
-        {
-            crate::transient_0::encode_bool(&true, writer)?;
-        };
-        {
-            crate::transient_0::encode_int_64(&((&value.a).as_ref()).unwrap(), writer)?;
-        };
+        crate::transient_0::encode_bool(&true, writer)?;
+        crate::transient_0::encode_int_64(&((&value.a).as_ref()).unwrap(), writer)?;
     } else {
         crate::transient_0::encode_bool(&false, writer)?;
     };
     if (&value.b).is_some() {
-        {
-            crate::transient_0::encode_bool(&true, writer)?;
-        };
-        {
-            crate::data::transient_0::encode_inner_struct(&((&value.b).as_ref()).unwrap(), writer)?;
-        };
+        crate::transient_0::encode_bool(&true, writer)?;
+        crate::data::transient_0::encode_inner_struct(&((&value.b).as_ref()).unwrap(), writer)?;
     } else {
         crate::transient_0::encode_bool(&false, writer)?;
     };
@@ -173,20 +165,12 @@ pub fn decode_enum_with_variants(reader: &mut impl std::io::Read) -> ::std::io::
 pub fn encode_sum_with_variants(value: &crate::data::SumWithVariants, writer: &mut impl std::io::Write) -> ::std::io::Result::<()> {
     match value {
         crate::data::SumWithVariants::VariantOne(value) => {
-            {
-                crate::transient_0::encode_int_32(&0, writer)?;
-            };
-            {
-                crate::data::transient_0::encode_variant_one(value, writer)?;
-            };
+            crate::transient_0::encode_int_32(&0, writer)?;
+            crate::data::transient_0::encode_variant_one(value, writer)?;
         },
         crate::data::SumWithVariants::VariantTwo(value) => {
-            {
-                crate::transient_0::encode_int_32(&1, writer)?;
-            };
-            {
-                crate::data::transient_0::encode_variant_two(value, writer)?;
-            };
+            crate::transient_0::encode_int_32(&1, writer)?;
+            crate::data::transient_0::encode_variant_two(value, writer)?;
         },
     };
     ::std::io::Result::Ok(())
diff --git a/examples/10-transient-0/output/rust/src/gen/transient_0.rs b/examples/10-transient-0/output/rust/src/gen/transient_0.rs
index 24f5c9c..753dd23 100644
--- a/examples/10-transient-0/output/rust/src/gen/transient_0.rs
+++ b/examples/10-transient-0/output/rust/src/gen/transient_0.rs
@@ -54,9 +54,7 @@ pub fn decode_int_64(reader: &mut impl std::io::Read) -> ::std::io::Result::<::c
 }
 
 pub fn encode_string(value: &::std::string::String, writer: &mut impl std::io::Write) -> ::std::io::Result::<()> {
-    {
-        crate::transient_0::encode_int_64(&((value.len()).try_into()).unwrap(), writer)?;
-    };
+    crate::transient_0::encode_int_64(&((value.len()).try_into()).unwrap(), writer)?;
     writer.write_all(value.as_bytes())?;
     ::std::io::Result::Ok(())
 }