Fix Received struct serialization for bincode compatibility

stalwartlabs · Nov 9, 2023 · 28a9b67 · 28a9b67
1 parent b6c080f
commit 28a9b67
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 65 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -521,82 +521,34 @@ pub struct DateTime {
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
 #[cfg_attr(feature = "serde_support", derive(Serialize, Deserialize))]
 pub struct Received<'x> {
-    #[cfg_attr(
-        feature = "serde_support",
-        serde(skip_serializing_if = "Option::is_none"),
-        serde(default)
-    )]
+    #[cfg_attr(feature = "serde_support", serde(default))]
     pub from: Option<Host<'x>>,
-    #[cfg_attr(
-        feature = "serde_support",
-        serde(skip_serializing_if = "Option::is_none"),
-        serde(default)
-    )]
+    #[cfg_attr(feature = "serde_support", serde(default))]
     pub from_ip: Option<IpAddr>,
-    #[cfg_attr(
-        feature = "serde_support",
-        serde(skip_serializing_if = "Option::is_none"),
-        serde(default)
-    )]
+    #[cfg_attr(feature = "serde_support", serde(default))]
     pub from_iprev: Option<Cow<'x, str>>,
-    #[cfg_attr(
-        feature = "serde_support",
-        serde(skip_serializing_if = "Option::is_none"),
-        serde(default)
-    )]
+    #[cfg_attr(feature = "serde_support", serde(default))]
     pub by: Option<Host<'x>>,
-    #[cfg_attr(
-        feature = "serde_support",
-        serde(skip_serializing_if = "Option::is_none"),
-        serde(default)
-    )]
+    #[cfg_attr(feature = "serde_support", serde(default))]
     pub for_: Option<Cow<'x, str>>,
-    #[cfg_attr(
-        feature = "serde_support",
-        serde(skip_serializing_if = "Option::is_none"),
-        serde(default)
-    )]
+    #[cfg_attr(feature = "serde_support", serde(default))]
     pub with: Option<Protocol>,
-    #[cfg_attr(
-        feature = "serde_support",
-        serde(skip_serializing_if = "Option::is_none"),
-        serde(default)
-    )]
+    #[cfg_attr(feature = "serde_support", serde(default))]
     pub tls_version: Option<TlsVersion>,
-    #[cfg_attr(
-        feature = "serde_support",
-        serde(skip_serializing_if = "Option::is_none"),
-        serde(default)
-    )]
+    #[cfg_attr(feature = "serde_support", serde(default))]
     pub tls_cipher: Option<Cow<'x, str>>,
     #[cfg_attr(
         feature = "serde_support",
         serde(skip_serializing_if = "Option::is_none")
     )]
     pub id: Option<Cow<'x, str>>,
-    #[cfg_attr(
-        feature = "serde_support",
-        serde(skip_serializing_if = "Option::is_none"),
-        serde(default)
-    )]
+    #[cfg_attr(feature = "serde_support", serde(default))]
     pub ident: Option<Cow<'x, str>>,
-    #[cfg_attr(
-        feature = "serde_support",
-        serde(skip_serializing_if = "Option::is_none"),
-        serde(default)
-    )]
+    #[cfg_attr(feature = "serde_support", serde(default))]
     pub helo: Option<Host<'x>>,
-    #[cfg_attr(
-        feature = "serde_support",
-        serde(skip_serializing_if = "Option::is_none"),
-        serde(default)
-    )]
+    #[cfg_attr(feature = "serde_support", serde(default))]
     pub helo_cmd: Option<Greeting>,
-    #[cfg_attr(
-        feature = "serde_support",
-        serde(skip_serializing_if = "Option::is_none"),
-        serde(default)
-    )]
+    #[cfg_attr(feature = "serde_support", serde(default))]
     pub via: Option<Cow<'x, str>>,
     pub date: Option<DateTime>,
 }

diff --git a/src/parsers/message.rs b/src/parsers/message.rs
@@ -24,7 +24,7 @@ const MAX_NESTED_ENCODED: usize = 3;
 #[derive(Debug, PartialEq, Default)]
 enum MimeType {
     MultipartMixed,
-    MultipartAlernative,
+    MultipartAlternative,
     MultipartRelated,
     MultipartDigest,
     TextPlain,
@@ -49,7 +49,7 @@ fn mime_type(
                 false,
                 match content_type.subtype() {
                     Some("mixed") => MimeType::MultipartMixed,
-                    Some("alternative") => MimeType::MultipartAlernative,
+                    Some("alternative") => MimeType::MultipartAlternative,
                     Some("related") => MimeType::MultipartRelated,
                     Some("digest") => MimeType::MultipartDigest,
                     _ => MimeType::Other,
@@ -170,7 +170,7 @@ impl MessageParser {
                         let part_id = message.parts.len();
                         let new_state = MessageParserState {
                             in_alternative: state.in_alternative
-                                || mime_type == MimeType::MultipartAlernative,
+                                || mime_type == MimeType::MultipartAlternative,
                             mime_type,
                             mime_boundary: mime_boundary.as_bytes().to_vec().into(),
                             html_parts: message.html_body.len(),
@@ -283,7 +283,7 @@ impl MessageParser {
                                     .map_or_else(|| true, |c| !c.has_attribute("name")))));
 
                 let (add_to_html, add_to_text) =
-                    if let MimeType::MultipartAlernative = state.mime_type {
+                    if let MimeType::MultipartAlternative = state.mime_type {
                         match mime_type {
                             MimeType::TextHtml => (true, false),
                             MimeType::TextPlain => (false, true),
@@ -440,7 +440,7 @@ impl MessageParser {
                     if stream.is_multipart_end() {
                         // End of MIME part reached
 
-                        if MimeType::MultipartAlernative == state.mime_type
+                        if MimeType::MultipartAlternative == state.mime_type
                             && state.need_html_body
                             && state.need_text_body
                         {