cleanup

Cargo.toml

@@ -2,7 +2,7 @@
 name = "mailparse"
 version = "0.16.1"
 authors = ["Kartikaya Gupta"]
-edition = "2018"
+edition = "2024"
 license = "0BSD"
 
 description = "A simple parser for MIME e-mail messages"
@@ -22,4 +22,4 @@ quoted_printable = "0.5.0"
 charset = "0.1.3"
 
 [dev-dependencies]
-ouroboros = "0.17.0"
+ouroboros = "0.18.0"

examples/dump_mail.rs

@@ -1,5 +1,3 @@
-extern crate mailparse;
-
 use std::env;
 use std::fs::File;
 use std::io::prelude::*;
@@ -12,18 +10,18 @@ fn dump(pfx: &str, pm: &mailparse::ParsedMail) {
         println!("  [{}] => [{}]", h.get_key(), h.get_value());
     }
     println!(">> Addresses from {} <<", pfx);
-    pm.headers
-        .get_first_value("From")
-        .map(|a| println!("{:?}", mailparse::addrparse(&a).unwrap()));
-    pm.headers
-        .get_first_value("To")
-        .map(|a| println!("{:?}", mailparse::addrparse(&a).unwrap()));
-    pm.headers
-        .get_first_value("Cc")
-        .map(|a| println!("{:?}", mailparse::addrparse(&a).unwrap()));
-    pm.headers
-        .get_first_value("Bcc")
-        .map(|a| println!("{:?}", mailparse::addrparse(&a).unwrap()));
+    if let Some(a) = pm.headers.get_first_value("From") {
+        println!("{:?}", mailparse::addrparse(&a).unwrap())
+    }
+    if let Some(a) = pm.headers.get_first_value("To") {
+        println!("{:?}", mailparse::addrparse(&a).unwrap())
+    }
+    if let Some(a) = pm.headers.get_first_value("Cc") {
+        println!("{:?}", mailparse::addrparse(&a).unwrap())
+    }
+    if let Some(a) = pm.headers.get_first_value("Bcc") {
+        println!("{:?}", mailparse::addrparse(&a).unwrap())
+    }
     println!(">> Body from {} <<", pfx);
     if pm.ctype.mimetype.starts_with("text/") {
         println!("  [{}]", pm.get_body().unwrap());

examples/owned.rs

@@ -1,7 +1,4 @@
-extern crate mailparse;
-extern crate ouroboros;
-
-use mailparse::{parse_mail, ParsedMail};
+use mailparse::{ParsedMail, parse_mail};
 use ouroboros::self_referencing;
 
 #[self_referencing]

src/body.rs

@@ -1,4 +1,4 @@
-use charset::{decode_ascii, Charset};
+use charset::{Charset, decode_ascii};
 
 use crate::{MailParseError, ParsedContentType};
 

src/dateparse.rs

@@ -80,7 +80,7 @@ pub fn dateparse(date: &str) -> Result<i64, MailParseError> {
     let mut month = 0;
     let mut day_of_month = 0;
     let mut state = DateParseState::Date;
-    for tok in date.split(|c| c == ' ' || c == ':') {
+    for tok in date.split([' ', ':']) {
         if tok.is_empty() {
             continue;
         }
@@ -157,7 +157,7 @@ pub fn dateparse(date: &str) -> Result<i64, MailParseError> {
             DateParseState::Timezone => {
                 let (tz, tz_sign) = match tok.parse::<i32>() {
                     Ok(v) if !(-2400..=2400).contains(&v) => {
-                        return Err(MailParseError::Generic("Invalid timezone"))
+                        return Err(MailParseError::Generic("Invalid timezone"));
                     }
                     Ok(v) if v < 0 => (-v, -1),
                     Ok(v) => (v, 1),

src/header.rs

@@ -54,13 +54,12 @@ fn decode_word(encoded: &str) -> Option<String> {
             // whitespace
             let to_decode = input.replace('_', " ");
             let trimmed = to_decode.trim_end();
-            let mut d = quoted_printable::decode(trimmed, quoted_printable::ParseMode::Robust);
-            if d.is_ok() && to_decode.len() != trimmed.len() {
-                d.as_mut()
-                    .unwrap()
-                    .extend_from_slice(to_decode[trimmed.len()..].as_bytes());
+            let mut decoded =
+                quoted_printable::decode(trimmed, quoted_printable::ParseMode::Robust).ok()?;
+            if to_decode.len() != trimmed.len() {
+                decoded.extend_from_slice(&to_decode.as_bytes()[trimmed.len()..]);
             }
-            d.ok()?
+            decoded
         }
         _ => return None,
     };
@@ -72,8 +71,8 @@ fn decode_word(encoded: &str) -> Option<String> {
 /// Tokenizes a single line of the header and produces a vector of
 /// tokens. Because this only processes a single line, it will never
 /// generate `HeaderToken::Newline` tokens.
-fn tokenize_header_line(line: &str) -> Vec<HeaderToken> {
-    fn maybe_whitespace(text: &str) -> HeaderToken {
+fn tokenize_header_line(line: &str) -> Vec<HeaderToken<'_>> {
+    fn maybe_whitespace(text: &str) -> HeaderToken<'_> {
         if text.trim_end().is_empty() {
             HeaderToken::Whitespace(text)
         } else {
@@ -134,7 +133,7 @@ fn tokenize_header_line(line: &str) -> Vec<HeaderToken> {
 /// the newline will be in a separate `HeaderToken::Whitespace` or
 /// `HeaderToken::Text` token. Semantically the `HeaderToken::Newline`
 /// tokens that come out of this still represent the CRLF newline.
-fn tokenize_header(value: &str) -> Vec<HeaderToken> {
+fn tokenize_header(value: &str) -> Vec<HeaderToken<'_>> {
     let mut tokens = Vec::new();
     let mut lines = value.lines();
     let mut first = true;
@@ -216,7 +215,7 @@ fn normalize_header_whitespace(tokens: Vec<HeaderToken>) -> Vec<HeaderToken> {
     result
 }
 
-pub fn normalized_tokens(raw_value: &str) -> Vec<HeaderToken> {
+pub fn normalized_tokens(raw_value: &str) -> Vec<HeaderToken<'_>> {
     normalize_header_whitespace(tokenize_header(raw_value))
 }
 

src/headers.rs

@@ -53,7 +53,7 @@ impl<'a> IntoIterator for Headers<'a> {
     type IntoIter = slice::Iter<'a, MailHeader<'a>>;
 
     fn into_iter(self) -> Self::IntoIter {
-        self.headers.into_iter()
+        self.headers.iter()
     }
 }
 
@@ -96,7 +96,7 @@ impl<'a> MailHeaderMap for Headers<'a> {
         self.headers.get_first_value(key)
     }
 
-    fn get_first_header(&self, key: &str) -> Option<&MailHeader> {
+    fn get_first_header(&self, key: &str) -> Option<&MailHeader<'_>> {
         self.headers.get_first_header(key)
     }
 
@@ -114,7 +114,7 @@ impl<'a> MailHeaderMap for Headers<'a> {
         self.headers.get_all_values(key)
     }
 
-    fn get_all_headers(&self, key: &str) -> Vec<&MailHeader> {
+    fn get_all_headers(&self, key: &str) -> Vec<&MailHeader<'_>> {
         self.headers.get_all_headers(key)
     }
 }