feat: skip any decoding for unit structs/variants

dnaka91 · Sep 13, 2023 · 8f5a4ec · 8f5a4ec
1 parent 86536c9
commit 8f5a4ec
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 105 deletions.
diff --git a/crates/stef-build/src/decode.rs b/crates/stef-build/src/decode.rs
@@ -17,20 +17,28 @@ pub fn compile_struct(
     let field_matches = compile_field_matches(fields);
     let field_assigns = compile_field_assigns(fields);
 
-    quote! {
-        impl #generics ::stef::Decode for #name #generics #generics_where {
-            fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
-                #field_vars
+    let body = if matches!(fields, Fields::Unit) {
+        quote! { Ok(Self) }
+    } else {
+        quote! {
+            #field_vars
 
-                loop{
-                    match ::stef::buf::decode_id(r)? {
-                        ::stef::buf::END_MARKER => break,
-                        #field_matches
-                        _ => continue,
-                    }
+            loop{
+                match ::stef::buf::decode_id(r)? {
+                    ::stef::buf::END_MARKER => break,
+                    #field_matches
+                    _ => continue,
                 }
+            }
+
+            Ok(Self #field_assigns)
+        }
+    };
 
-                Ok(Self #field_assigns)
+    quote! {
+        impl #generics ::stef::Decode for #name #generics #generics_where {
+            fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
+                #body
             }
         }
     }
@@ -75,19 +83,23 @@ fn compile_variant(
     let field_matches = compile_field_matches(fields);
     let field_assigns = compile_field_assigns(fields);
 
-    quote! {
-        #id => {
-            #field_vars
+    if matches!(fields, Fields::Unit) {
+        quote! { #id => Ok(Self::#name) }
+    } else {
+        quote! {
+            #id => {
+                #field_vars
 
-            loop{
-                match ::stef::buf::decode_id(r)? {
-                    ::stef::buf::END_MARKER => break,
-                    #field_matches
-                    _ => continue,
+                loop{
+                    match ::stef::buf::decode_id(r)? {
+                        ::stef::buf::END_MARKER => break,
+                        #field_matches
+                        _ => continue,
+                    }
                 }
-            }
 
-            Ok(Self::#name #field_assigns)
+                Ok(Self::#name #field_assigns)
+            }
         }
     }
 }

diff --git a/crates/stef-build/tests/snapshots/compiler__compile@attribute-multi.stef.snap b/crates/stef-build/tests/snapshots/compiler__compile@attribute-multi.stef.snap
@@ -9,12 +9,6 @@ impl ::stef::Encode for Sample {
 }
 impl ::stef::Decode for Sample {
     fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
-        loop {
-            match ::stef::buf::decode_id(r)? {
-                ::stef::buf::END_MARKER => break,
-                _ => continue,
-            }
-        }
         Ok(Self)
     }
 }

diff --git a/crates/stef-build/tests/snapshots/compiler__compile@attribute-single.stef.snap b/crates/stef-build/tests/snapshots/compiler__compile@attribute-single.stef.snap
@@ -9,12 +9,6 @@ impl ::stef::Encode for Sample {
 }
 impl ::stef::Decode for Sample {
     fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
-        loop {
-            match ::stef::buf::decode_id(r)? {
-                ::stef::buf::END_MARKER => break,
-                _ => continue,
-            }
-        }
         Ok(Self)
     }
 }

diff --git a/crates/stef-build/tests/snapshots/compiler__compile@attribute-unit.stef.snap b/crates/stef-build/tests/snapshots/compiler__compile@attribute-unit.stef.snap
@@ -9,12 +9,6 @@ impl ::stef::Encode for Sample {
 }
 impl ::stef::Decode for Sample {
     fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
-        loop {
-            match ::stef::buf::decode_id(r)? {
-                ::stef::buf::END_MARKER => break,
-                _ => continue,
-            }
-        }
         Ok(Self)
     }
 }

diff --git a/crates/stef-build/tests/snapshots/compiler__compile@attributes-min-ws.stef.snap b/crates/stef-build/tests/snapshots/compiler__compile@attributes-min-ws.stef.snap
@@ -9,12 +9,6 @@ impl ::stef::Encode for Sample {
 }
 impl ::stef::Decode for Sample {
     fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
-        loop {
-            match ::stef::buf::decode_id(r)? {
-                ::stef::buf::END_MARKER => break,
-                _ => continue,
-            }
-        }
         Ok(Self)
     }
 }

diff --git a/crates/stef-build/tests/snapshots/compiler__compile@attributes.stef.snap b/crates/stef-build/tests/snapshots/compiler__compile@attributes.stef.snap
@@ -9,12 +9,6 @@ impl ::stef::Encode for Sample {
 }
 impl ::stef::Decode for Sample {
     fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
-        loop {
-            match ::stef::buf::decode_id(r)? {
-                ::stef::buf::END_MARKER => break,
-                _ => continue,
-            }
-        }
         Ok(Self)
     }
 }

diff --git a/crates/stef-build/tests/snapshots/compiler__compile@enum-basic.stef.snap b/crates/stef-build/tests/snapshots/compiler__compile@enum-basic.stef.snap
@@ -44,15 +44,7 @@ impl ::stef::Encode for Sample {
 impl ::stef::Decode for Sample {
     fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
         match ::stef::buf::decode_id(r)? {
-            1 => {
-                loop {
-                    match ::stef::buf::decode_id(r)? {
-                        ::stef::buf::END_MARKER => break,
-                        _ => continue,
-                    }
-                }
-                Ok(Self::One)
-            }
+            1 => Ok(Self::One),
             2 => {
                 let mut n0: Option<u32> = None;
                 let mut n1: Option<u64> = None;

diff --git a/crates/stef-build/tests/snapshots/compiler__compile@enum-generics.stef.snap b/crates/stef-build/tests/snapshots/compiler__compile@enum-generics.stef.snap
@@ -43,15 +43,7 @@ where
 {
     fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
         match ::stef::buf::decode_id(r)? {
-            1 => {
-                loop {
-                    match ::stef::buf::decode_id(r)? {
-                        ::stef::buf::END_MARKER => break,
-                        _ => continue,
-                    }
-                }
-                Ok(Self::One)
-            }
+            1 => Ok(Self::One),
             2 => {
                 let mut n0: Option<A> = None;
                 let mut n1: Option<B> = None;

diff --git a/crates/stef-build/tests/snapshots/compiler__compile@enum-many-ws.stef.snap b/crates/stef-build/tests/snapshots/compiler__compile@enum-many-ws.stef.snap
@@ -39,15 +39,7 @@ impl ::stef::Encode for Sample {
 impl ::stef::Decode for Sample {
     fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
         match ::stef::buf::decode_id(r)? {
-            1 => {
-                loop {
-                    match ::stef::buf::decode_id(r)? {
-                        ::stef::buf::END_MARKER => break,
-                        _ => continue,
-                    }
-                }
-                Ok(Self::One)
-            }
+            1 => Ok(Self::One),
             2 => {
                 let mut n0: Option<u32> = None;
                 let mut n1: Option<u64> = None;

diff --git a/crates/stef-build/tests/snapshots/compiler__compile@enum-min-ws.stef.snap b/crates/stef-build/tests/snapshots/compiler__compile@enum-min-ws.stef.snap
@@ -46,15 +46,7 @@ where
 {
     fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
         match ::stef::buf::decode_id(r)? {
-            1 => {
-                loop {
-                    match ::stef::buf::decode_id(r)? {
-                        ::stef::buf::END_MARKER => break,
-                        _ => continue,
-                    }
-                }
-                Ok(Self::One)
-            }
+            1 => Ok(Self::One),
             2 => {
                 let mut n0: Option<u32> = None;
                 let mut n1: Option<u64> = None;

diff --git a/crates/stef-build/tests/snapshots/compiler__compile@module-basic.stef.snap b/crates/stef-build/tests/snapshots/compiler__compile@module-basic.stef.snap
@@ -21,15 +21,7 @@ pub mod a {
         impl ::stef::Decode for Sample {
             fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
                 match ::stef::buf::decode_id(r)? {
-                    1 => {
-                        loop {
-                            match ::stef::buf::decode_id(r)? {
-                                ::stef::buf::END_MARKER => break,
-                                _ => continue,
-                            }
-                        }
-                        Ok(Self::One)
-                    }
+                    1 => Ok(Self::One),
                     id => Err(Error::UnknownVariant(id)),
                 }
             }

diff --git a/crates/stef-build/tests/snapshots/compiler__compile@schema-basic.stef.snap b/crates/stef-build/tests/snapshots/compiler__compile@schema-basic.stef.snap
@@ -76,15 +76,7 @@ impl ::stef::Encode for Sample {
 impl ::stef::Decode for Sample {
     fn decode(r: &mut impl ::stef::Buf) -> ::stef::buf::Result<Self> {
         match ::stef::buf::decode_id(r)? {
-            1 => {
-                loop {
-                    match ::stef::buf::decode_id(r)? {
-                        ::stef::buf::END_MARKER => break,
-                        _ => continue,
-                    }
-                }
-                Ok(Self::One)
-            }
+            1 => Ok(Self::One),
             2 => {
                 let mut n0: Option<u32> = None;
                 let mut n1: Option<u64> = None;