Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-17 05:46:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix nightly clippy warnings

Browse Source
This commit is contained in:
link2xt
2024-04-10 14:01:57 +00:00
parent bab311730c
commit fbbefe6b49
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blob.rs
View File

@@ -740,7 +740,6 @@ fn add_white_bg(img: &mut DynamicImage) {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use fs::File; use fs::File;
use image::Pixel;
use super::*; use super::*;
use crate::chat::{self, create_group_chat, ProtectionStatus}; use crate::chat::{self, create_group_chat, ProtectionStatus};

2
src/chat.rs
View File

@@ -1439,7 +1439,7 @@ impl rusqlite::types::ToSql for ChatId {
impl rusqlite::types::FromSql for ChatId { impl rusqlite::types::FromSql for ChatId {
fn column_result(value: rusqlite::types::ValueRef) -> rusqlite::types::FromSqlResult<Self> { fn column_result(value: rusqlite::types::ValueRef) -> rusqlite::types::FromSqlResult<Self> {
i64::column_result(value).and_then(|val| { i64::column_result(value).and_then(|val| {
if 0 <= val && val <= i64::from(std::u32::MAX) { if 0 <= val && val <= i64::from(u32::MAX) {
Ok(ChatId::new(val as u32)) Ok(ChatId::new(val as u32))
} else { } else {
Err(rusqlite::types::FromSqlError::OutOfRange(val)) Err(rusqlite::types::FromSqlError::OutOfRange(val))

2
src/message.rs
View File

@@ -362,7 +362,7 @@ impl rusqlite::types::FromSql for MsgId {
fn column_result(value: rusqlite::types::ValueRef) -> rusqlite::types::FromSqlResult<Self> { fn column_result(value: rusqlite::types::ValueRef) -> rusqlite::types::FromSqlResult<Self> {
// Would be nice if we could use match here, but alas. // Would be nice if we could use match here, but alas.
i64::column_result(value).and_then(|val| { i64::column_result(value).and_then(|val| {
if 0 <= val && val <= i64::from(std::u32::MAX) { if 0 <= val && val <= i64::from(u32::MAX) {
Ok(MsgId::new(val as u32)) Ok(MsgId::new(val as u32))
} else { } else {
Err(rusqlite::types::FromSqlError::OutOfRange(val)) Err(rusqlite::types::FromSqlError::OutOfRange(val))

3
src/mimefactory.rs
View File

@@ -1586,9 +1586,8 @@ mod tests {
use std::str; use std::str;
use super::*; use super::*;
use crate::chat::ChatId;
use crate::chat::{ use crate::chat::{
self, add_contact_to_chat, create_group_chat, remove_contact_from_chat, send_text_msg, add_contact_to_chat, create_group_chat, remove_contact_from_chat, send_text_msg, ChatId,
ProtectionStatus, ProtectionStatus,
}; };
use crate::chatlist::Chatlist; use crate::chatlist::Chatlist;

2
src/receive_imf/tests.rs
View File

@@ -9,7 +9,7 @@ use crate::chat::{
ChatVisibility, ChatVisibility,
}; };
use crate::chatlist::Chatlist; use crate::chatlist::Chatlist;
use crate::constants::{ShowEmails, DC_GCL_FOR_FORWARDING, DC_GCL_NO_SPECIALS}; use crate::constants::{DC_GCL_FOR_FORWARDING, DC_GCL_NO_SPECIALS};
use crate::download::MIN_DOWNLOAD_LIMIT; use crate::download::MIN_DOWNLOAD_LIMIT;
use crate::imap::prefetch_should_download; use crate::imap::prefetch_should_download;
use crate::imex::{imex, ImexMode}; use crate::imex::{imex, ImexMode};

6
src/test_utils.rs
View File

@@ -1056,8 +1056,10 @@ pub(crate) async fn mark_as_verified(this: &TestContext, other: &TestContext) {
0, 0,
); );
peerstate.verified_key = peerstate.public_key.clone(); peerstate.verified_key.clone_from(&peerstate.public_key);
peerstate.verified_key_fingerprint = peerstate.public_key_fingerprint.clone(); peerstate
.verified_key_fingerprint
.clone_from(&peerstate.public_key_fingerprint);
peerstate.backward_verified_key_id = Some(this.get_config_i64(Config::KeyId).await.unwrap()); peerstate.backward_verified_key_id = Some(this.get_config_i64(Config::KeyId).await.unwrap());
peerstate.save_to_db(&this.sql).await.unwrap(); peerstate.save_to_db(&this.sql).await.unwrap();