diff --git a/src/chat.rs b/src/chat.rs index 546f9737b..4caa095ab 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -1295,8 +1295,8 @@ pub async fn get_by_contact_id(context: &Context, contact_id: u32) -> Result( - context: &'a Context, +pub async fn prepare_msg( + context: &Context, chat_id: ChatId, msg: &mut Message, ) -> Result { diff --git a/src/configure/mod.rs b/src/configure/mod.rs index 81bf319b9..bb981f6d4 100644 --- a/src/configure/mod.rs +++ b/src/configure/mod.rs @@ -166,6 +166,7 @@ impl Context { } } +#[allow(clippy::too_many_arguments)] async fn exec_step( ctx: &Context, imap: &mut Imap, diff --git a/src/param.rs b/src/param.rs index 3fc64e346..7d72adad9 100644 --- a/src/param.rs +++ b/src/param.rs @@ -275,6 +275,7 @@ impl Params { /// created without copying if the path already referes to a valid /// blob. If so a [BlobObject] will be returned regardless of the /// `create` argument. + #[allow(clippy::needless_lifetimes)] pub async fn get_blob<'a>( &self, key: Param, diff --git a/src/scheduler.rs b/src/scheduler.rs index be0ac7f3d..b9f9b5220 100644 --- a/src/scheduler.rs +++ b/src/scheduler.rs @@ -381,30 +381,26 @@ impl Scheduler { } async fn interrupt_inbox(&self) { - match self { - Scheduler::Running { ref inbox, .. } => inbox.interrupt().await, - _ => {} + if let Scheduler::Running { ref inbox, .. } = self { + inbox.interrupt().await; } } async fn interrupt_mvbox(&self) { - match self { - Scheduler::Running { ref mvbox, .. } => mvbox.interrupt().await, - _ => {} + if let Scheduler::Running { ref mvbox, .. } = self { + mvbox.interrupt().await; } } async fn interrupt_sentbox(&self) { - match self { - Scheduler::Running { ref sentbox, .. } => sentbox.interrupt().await, - _ => {} + if let Scheduler::Running { ref sentbox, .. } = self { + sentbox.interrupt().await; } } async fn interrupt_smtp(&self) { - match self { - Scheduler::Running { ref smtp, .. } => smtp.interrupt().await, - _ => {} + if let Scheduler::Running { ref smtp, .. } = self { + smtp.interrupt().await; } } diff --git a/src/securejoin.rs b/src/securejoin.rs index aab4dab5c..8e93fb6d5 100644 --- a/src/securejoin.rs +++ b/src/securejoin.rs @@ -184,7 +184,7 @@ async fn cleanup( /// Take a scanned QR-code and do the setup-contact/join-group handshake. /// See the ffi-documentation for more details. pub async fn dc_join_securejoin(context: &Context, qr: &str) -> ChatId { - if let Err(_) = context.alloc_ongoing().await { + if context.alloc_ongoing().await.is_err() { return cleanup(&context, ChatId::new(0), false, false).await; } @@ -344,7 +344,7 @@ async fn send_handshake_msg( chat::send_msg(context, contact_chat_id, &mut msg) .await - .map_err(|err| HandshakeError::MsgSendFailed(err))?; + .map_err(HandshakeError::MsgSendFailed)?; Ok(()) }