hoist common if condition out of if-else

stalwartlabs · Dec 6, 2023 · e0030a2 · e0030a2
1 parent e9b8d78
commit e0030a2
Showing 1 changed file with 13 additions and 25 deletions.
diff --git a/src/parsers/message.rs b/src/parsers/message.rs
@@ -307,6 +307,19 @@ impl MessageParser {
                         (false, false)
                     };
 
+                if add_to_html {
+                    message.html_body.push(message.parts.len());
+                }
+                if add_to_text {
+                    message.text_body.push(message.parts.len());
+                }
+
+                if !is_multipart && !(add_to_text || add_to_html)
+                    || (is_media || is_multipart) && (!add_to_text || !add_to_html)
+                {
+                    message.attachments.push(message.parts.len());
+                }
+
                 if is_text {
                     let text = match (
                         bytes,
@@ -325,37 +338,12 @@ impl MessageParser {
                         (Cow::Borrowed(bytes), None) => String::from_utf8_lossy(bytes),
                     };
 
-                    if add_to_html {
-                        message.html_body.push(message.parts.len());
-                    }
-                    if add_to_text {
-                        message.text_body.push(message.parts.len());
-                    }
-
-                    if !is_multipart && !(add_to_text || add_to_html)
-                        || (is_media || is_multipart) && (!add_to_text || !add_to_html)
-                    {
-                        message.attachments.push(message.parts.len());
-                    }
-
                     if mime_type == MimeType::TextHtml {
                         PartType::Html(text)
                     } else {
                         PartType::Text(text)
                     }
                 } else {
-                    if add_to_html {
-                        message.html_body.push(message.parts.len());
-                    }
-                    if add_to_text {
-                        message.text_body.push(message.parts.len());
-                    }
-                    if !is_multipart && !(add_to_text || add_to_html)
-                        || (is_media || is_multipart) && (!add_to_text || !add_to_html)
-                    {
-                        message.attachments.push(message.parts.len());
-                    }
-
                     if !is_inline {
                         PartType::Binary(bytes)
                     } else {