From f8755b505e08c8a7188dd6d2cd01eb5e53af77eb Mon Sep 17 00:00:00 2001 From: link2xt Date: Wed, 24 Feb 2021 23:56:03 +0300 Subject: [PATCH] Fix clippy::unnecessary_wraps warnings This lint is enabled by default in 1.50 toolchain. --- src/dc_receive_imf.rs | 28 ++++++++++------------------ src/mimeparser.rs | 27 ++++++++++++--------------- 2 files changed, 22 insertions(+), 33 deletions(-) diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs index 963d7e62a..55eeedf1c 100644 --- a/src/dc_receive_imf.rs +++ b/src/dc_receive_imf.rs @@ -167,12 +167,7 @@ pub(crate) async fn dc_receive_imf_inner( // missing Message-IDs may come if the mail was set from this account with another // client that relies in the SMTP server to generate one. // true eg. for the Webmailer used in all-inkl-KAS - match dc_create_incoming_rfc724_mid(sent_timestamp, from_id, &to_ids) { - Some(x) => x, - None => { - bail!("No Message-Id found and could not create incoming rfc724_mid"); - } - } + dc_create_incoming_rfc724_mid(sent_timestamp, from_id, &to_ids) } }; if mime_parser.parts.last().is_some() { @@ -1897,11 +1892,9 @@ async fn get_rfc724_mid_in_list(context: &Context, mid_list: &str) -> Result Option { +) -> String { /* create a deterministic rfc724_mid from input such that repeatedly calling it with the same input results in the same Message-id */ let largest_id_to = contact_ids_to.iter().max().copied().unwrap_or_default(); - let result = format!( + format!( "{}-{}-{}@stub", message_timestamp, contact_id_from, largest_id_to - ); - Some(result) + ) } #[cfg(test)] @@ -2070,18 +2062,18 @@ mod tests { let mut members = ContactIds::new(); assert_eq!( dc_create_incoming_rfc724_mid(123, 45, &members), - Some("123-45-0@stub".into()) + "123-45-0@stub" ); members.insert(7); members.insert(3); assert_eq!( dc_create_incoming_rfc724_mid(123, 45, &members), - Some("123-45-7@stub".into()) + "123-45-7@stub" ); members.insert(9); assert_eq!( dc_create_incoming_rfc724_mid(123, 45, &members), - Some("123-45-9@stub".into()) + "123-45-9@stub" ); } diff --git a/src/mimeparser.rs b/src/mimeparser.rs index dfe3d4986..1e3a1a896 100644 --- a/src/mimeparser.rs +++ b/src/mimeparser.rs @@ -260,7 +260,7 @@ impl MimeMessage { parser.parse_mime_recursive(context, &mail).await?; parser.maybe_remove_bad_parts(); parser.heuristically_parse_ndn(context).await; - parser.parse_headers(context)?; + parser.parse_headers(context); if warn_empty_signature && parser.signatures.is_empty() { for part in parser.parts.iter_mut() { @@ -276,7 +276,7 @@ impl MimeMessage { } /// Parses system messages. - fn parse_system_message_headers(&mut self, context: &Context) -> Result<()> { + fn parse_system_message_headers(&mut self, context: &Context) { if self.get(HeaderDef::AutocryptSetupMessage).is_some() { self.parts = self .parts @@ -304,7 +304,6 @@ impl MimeMessage { self.is_system_message = SystemMessage::ChatProtectionDisabled; } } - Ok(()) } /// Parses avatar action headers. @@ -404,8 +403,8 @@ impl MimeMessage { } } - fn parse_headers(&mut self, context: &Context) -> Result<()> { - self.parse_system_message_headers(context)?; + fn parse_headers(&mut self, context: &Context) { + self.parse_system_message_headers(context); self.parse_avatar_headers(); self.parse_videochat_headers(); self.squash_attachment_parts(); @@ -481,8 +480,6 @@ impl MimeMessage { self.parts.push(part); } - - Ok(()) } fn avatar_action_from_header(&mut self, header_value: String) -> Option { @@ -1236,7 +1233,7 @@ pub(crate) struct FailureReport { } #[allow(clippy::indexing_slicing)] -pub(crate) fn parse_message_ids(ids: &str) -> Result> { +pub(crate) fn parse_message_ids(ids: &str) -> Vec { // take care with mailparse::msgidparse() that is pretty untolerant eg. wrt missing `<` or `>` let mut msgids = Vec::new(); for id in ids.split_whitespace() { @@ -1251,11 +1248,11 @@ pub(crate) fn parse_message_ids(ids: &str) -> Result> { msgids.push(id); } } - Ok(msgids) + msgids } pub(crate) fn parse_message_id(ids: &str) -> Result { - if let Some(id) = parse_message_ids(ids)?.first() { + if let Some(id) = parse_message_ids(ids).first() { Ok(id.to_string()) } else { bail!("could not parse message_id: {}", ids); @@ -2507,23 +2504,23 @@ CWt6wx7fiLp0qS9RrX75g6Gqw7nfCs6EcBERcIPt7DTe8VStJwf3LWqVwxl4gQl46yhfoqwEO+I= #[test] fn test_parse_message_ids() { - let test = parse_message_ids(" foo bar ").unwrap(); + let test = parse_message_ids(" foo bar "); assert_eq!(test.len(), 3); assert_eq!(test[0], "foo"); assert_eq!(test[1], "bar"); assert_eq!(test[2], "foobar"); - let test = parse_message_ids(" < foobar >").unwrap(); + let test = parse_message_ids(" < foobar >"); assert_eq!(test.len(), 1); assert_eq!(test[0], "foobar"); - let test = parse_message_ids("").unwrap(); + let test = parse_message_ids(""); assert!(test.is_empty()); - let test = parse_message_ids(" ").unwrap(); + let test = parse_message_ids(" "); assert!(test.is_empty()); - let test = parse_message_ids(" < ").unwrap(); + let test = parse_message_ids(" < "); assert!(test.is_empty()); }