diff --git a/src/dc_tools.rs b/src/dc_tools.rs index 71a7bad02..3d90f6343 100644 --- a/src/dc_tools.rs +++ b/src/dc_tools.rs @@ -460,7 +460,7 @@ pub(crate) fn time() -> i64 { /// /// ``` /// use deltachat::dc_tools::EmailAddress; -/// let email = match EmailAddress::new("someone@example.com") { +/// let email = match "someone@example.com".parse::() { /// Ok(addr) => addr, /// Err(e) => panic!("Error parsing address, error was {}", e), /// }; @@ -474,12 +474,6 @@ pub struct EmailAddress { pub domain: String, } -impl EmailAddress { - pub fn new(input: &str) -> Result { - input.parse::() - } -} - impl fmt::Display for EmailAddress { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "{}@{}", self.local, self.domain) @@ -670,29 +664,29 @@ mod tests { #[test] fn test_emailaddress_parse() { - assert_eq!(EmailAddress::new("").is_ok(), false); + assert_eq!("".parse::().is_ok(), false); assert_eq!( - EmailAddress::new("user@domain.tld").unwrap(), + "user@domain.tld".parse::().unwrap(), EmailAddress { local: "user".into(), domain: "domain.tld".into(), } ); - assert_eq!(EmailAddress::new("uuu").is_ok(), false); - assert_eq!(EmailAddress::new("dd.tt").is_ok(), false); - assert_eq!(EmailAddress::new("tt.dd@uu").is_ok(), false); - assert_eq!(EmailAddress::new("u@d").is_ok(), false); - assert_eq!(EmailAddress::new("u@d.").is_ok(), false); - assert_eq!(EmailAddress::new("u@d.t").is_ok(), false); + assert_eq!("uuu".parse::().is_ok(), false); + assert_eq!("dd.tt".parse::().is_ok(), false); + assert_eq!("tt.dd@uu".parse::().is_ok(), false); + assert_eq!("u@d".parse::().is_ok(), false); + assert_eq!("u@d.".parse::().is_ok(), false); + assert_eq!("u@d.t".parse::().is_ok(), false); assert_eq!( - EmailAddress::new("u@d.tt").unwrap(), + "u@d.tt".parse::().unwrap(), EmailAddress { local: "u".into(), domain: "d.tt".into(), } ); - assert_eq!(EmailAddress::new("u@.tt").is_ok(), false); - assert_eq!(EmailAddress::new("@d.tt").is_ok(), false); + assert_eq!("u@tt".parse::().is_ok(), false); + assert_eq!("@d.tt".parse::().is_ok(), false); } use proptest::prelude::*;