Skip to content

Commit

Permalink
fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
soywod committed Jan 8, 2023
1 parent c66b68d commit aeeda77
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 16 deletions.
4 changes: 2 additions & 2 deletions src/address/types.rs
Expand Up @@ -255,9 +255,9 @@ impl Display for AddressError {
AddressError::Unbalanced => f.write_str("Unbalanced angle bracket"),
AddressError::InvalidUser => f.write_str("Invalid email user"),
AddressError::InvalidDomain => f.write_str("Invalid email domain"),
AddressError::UnexpectedInput => f.write_str("Unexpected input found"),
AddressError::UnexpectedInput => f.write_str("Unexpected input"),
AddressError::UnclosedDelimiter => f.write_str("Unclosed delimiter"),
AddressError::Unknown => f.write_str("Unknown parsing error"),
AddressError::Unknown => f.write_str("Unknown address parsing error"),
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/message/header/mailbox.rs
Expand Up @@ -278,8 +278,6 @@ mod test {
"pony@domain.tld".parse().unwrap(),
];

println!("from: {:?}", from);

let mut headers = Headers::new();
headers.insert_raw(HeaderValue::new(
HeaderName::new_from_ascii_str("From"),
Expand Down
12 changes: 2 additions & 10 deletions src/message/mailbox/parsers/rfc2234.rs
Expand Up @@ -4,29 +4,21 @@
//! [RFC2234]: https://datatracker.ietf.org/doc/html/rfc2234

use chumsky::prelude::*;
use once_cell::sync::Lazy;

const DQUOTE: char = 0x22 as char;

static US_ASCII_30_39: Lazy<Vec<char>> = Lazy::new(|| ((0x30 as char)..=(0x39 as char)).collect());
static US_ASCII_41_5A: Lazy<Vec<char>> = Lazy::new(|| ((0x41 as char)..=(0x5A as char)).collect());
static US_ASCII_61_7A: Lazy<Vec<char>> = Lazy::new(|| ((0x61 as char)..=(0x7A as char)).collect());

// 6.1 Core Rules
// https://datatracker.ietf.org/doc/html/rfc2234#section-6.1

// ALPHA = %x41-5A / %x61-7A ; A-Z / a-z
pub(super) fn alpha() -> impl Parser<char, char, Error = Simple<char>> {
choice((
one_of(US_ASCII_41_5A.as_slice()),
one_of(US_ASCII_61_7A.as_slice()),
))
filter(|c: &char| c.is_ascii_alphabetic())
}

// DIGIT = %x30-39
// ; 0-9
pub(super) fn digit() -> impl Parser<char, char, Error = Simple<char>> {
one_of(US_ASCII_30_39.as_slice())
filter(|c: &char| c.is_ascii_digit())
}

// DQUOTE = %x22
Expand Down
8 changes: 6 additions & 2 deletions src/message/mailbox/types.rs
Expand Up @@ -122,7 +122,10 @@ impl FromStr for Mailbox {
Some(SimpleReason::Custom(_)) | None => AddressError::Unknown,
}
})?;
Ok(Mailbox::new(name, Address::new(user, domain).unwrap()))

let mailbox = Mailbox::new(name, Address::new(user, domain)?);

Ok(mailbox)
}
}

Expand Down Expand Up @@ -339,6 +342,7 @@ impl FromStr for Mailboxes {

fn from_str(src: &str) -> Result<Self, Self::Err> {
let mut mailboxes = Vec::new();

let parsed_mailboxes = parsers::mailbox_list().parse(src).map_err(|errs| {
match errs.first().map(|err| err.reason()) {
Some(SimpleReason::Unexpected) => AddressError::UnexpectedInput,
Expand All @@ -348,7 +352,7 @@ impl FromStr for Mailboxes {
})?;

for (name, (user, domain)) in parsed_mailboxes {
mailboxes.push(Mailbox::new(name, Address::new(user, domain).unwrap()))
mailboxes.push(Mailbox::new(name, Address::new(user, domain)?))
}

Ok(Mailboxes(mailboxes))
Expand Down

0 comments on commit aeeda77

Please sign in to comment.