diff --git a/src/blob.rs b/src/blob.rs index d0c22ff08..53777fc9d 100644 --- a/src/blob.rs +++ b/src/blob.rs @@ -140,9 +140,10 @@ impl<'a> BlobObject<'a> { context: &Context, src: impl AsRef, ) -> std::result::Result { - match src.as_ref().starts_with(context.get_blobdir()) { - true => BlobObject::from_path(context, src), - false => BlobObject::create_and_copy(context, src), + if src.as_ref().starts_with(context.get_blobdir()) { + BlobObject::from_path(context, src) + } else { + BlobObject::create_and_copy(context, src) } } @@ -264,13 +265,13 @@ impl<'a> BlobObject<'a> { fn sanitise_name(name: &str) -> (String, String) { let mut name = name.to_string(); for part in name.rsplit('/') { - if part.len() > 0 { + if !part.is_empty() { name = part.to_string(); break; } } for part in name.rsplit('\\') { - if part.len() > 0 { + if !part.is_empty() { name = part.to_string(); break; } diff --git a/src/chat.rs b/src/chat.rs index 98ef7755d..b722b26c5 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -1207,9 +1207,8 @@ pub fn get_chat_media( |ids| { let mut ret = Vec::new(); for id in ids { - match id { - Ok(msg_id) => ret.push(msg_id), - Err(_) => (), + if let Ok(msg_id) = id { + ret.push(msg_id) } } Ok(ret) @@ -1530,7 +1529,7 @@ pub(crate) fn add_contact_to_chat_ex( msg.id = send_msg(context, chat_id, &mut msg)?; context.call_cb(Event::MsgsChanged { chat_id, - msg_id: MsgId::from(msg.id), + msg_id: msg.id, }); } context.call_cb(Event::MsgsChanged { diff --git a/src/configure/mod.rs b/src/configure/mod.rs index d2d43bc98..ebb280178 100644 --- a/src/configure/mod.rs +++ b/src/configure/mod.rs @@ -92,7 +92,7 @@ pub fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context) { const STEP_3_INDEX: u8 = 13; let mut step_counter: u8 = 0; while !context.shall_stop_ongoing() { - step_counter = step_counter + 1; + step_counter += 1; let success = match step_counter { // Read login parameters from the database diff --git a/src/dc_strencode.rs b/src/dc_strencode.rs index f1f3c7f27..91f49f375 100644 --- a/src/dc_strencode.rs +++ b/src/dc_strencode.rs @@ -38,7 +38,7 @@ pub fn dc_encode_header_words(input: impl AsRef) -> String { fn must_encode(byte: u8) -> bool { static SPECIALS: &[u8] = b",:!\"#$@[\\]^`{|}~=?_"; - SPECIALS.into_iter().any(|b| *b == byte) + SPECIALS.iter().any(|b| *b == byte) } fn quote_word(word: &[u8]) -> String { diff --git a/src/job.rs b/src/job.rs index 6fbd8ae40..8bd1f4d7a 100644 --- a/src/job.rs +++ b/src/job.rs @@ -522,7 +522,7 @@ pub fn perform_smtp_idle(context: &Context) { let res = cvar.wait_timeout(state, dur).unwrap(); state = res.0; - if state.idle == true || res.1.timed_out() { + if state.idle || res.1.timed_out() { // We received the notification and the value has been updated, we can leave. break; } diff --git a/src/smtp.rs b/src/smtp.rs index 253a1c260..4b1922d67 100644 --- a/src/smtp.rs +++ b/src/smtp.rs @@ -138,7 +138,7 @@ impl Smtp { /// SMTP-Send a prepared mail to recipients. /// on successful send out Ok() is returned. - pub fn send<'a>( + pub fn send( &mut self, context: &Context, recipients: Vec,