From 32459b3fdc14731daa96b3ff40230f6a79a43df9 Mon Sep 17 00:00:00 2001 From: link2xt Date: Tue, 17 Dec 2024 21:33:49 +0000 Subject: [PATCH] Reapply "build: increase MSRV to 1.81.0" This reverts commit 9d331483e949ccd7523e9e304173f529333391a3. --- .github/workflows/ci.yml | 4 ++-- Cargo.toml | 2 +- src/chat.rs | 4 ++-- src/contact.rs | 1 - src/imap.rs | 3 +-- src/mimefactory.rs | 1 - src/mimeparser.rs | 2 +- src/param.rs | 1 - src/pgp.rs | 2 -- src/quota.rs | 2 +- src/receive_imf.rs | 9 ++++----- src/smtp.rs | 2 +- src/smtp/connect.rs | 2 +- 13 files changed, 14 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa0ef8415..9a3b21399 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,9 +103,9 @@ jobs: - os: macos-latest rust: 1.84.0 - # Minimum Supported Rust Version = 1.77.0 + # Minimum Supported Rust Version = 1.81.0 - os: ubuntu-latest - rust: 1.77.0 + rust: 1.81.0 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/Cargo.toml b/Cargo.toml index c3f513a84..4c0aa6302 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "deltachat" version = "1.154.3" edition = "2021" license = "MPL-2.0" -rust-version = "1.77" +rust-version = "1.81" repository = "https://github.com/deltachat/deltachat-core-rust" [profile.dev] diff --git a/src/chat.rs b/src/chat.rs index 3c671d1c8..6d7a37d20 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -313,7 +313,7 @@ impl ChatId { /// Create a group or mailinglist raw database record with the given parameters. /// The function does not add SELF nor checks if the record already exists. - #[allow(clippy::too_many_arguments)] + #[expect(clippy::too_many_arguments)] pub(crate) async fn create_multiuser_record( context: &Context, chattype: Chattype, @@ -4616,7 +4616,7 @@ pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Resul /// /// For example, it can be a message showing that a member was added to a group. /// Doesn't fail if the chat doesn't exist. -#[allow(clippy::too_many_arguments)] +#[expect(clippy::too_many_arguments)] pub(crate) async fn add_info_msg_with_cmd( context: &Context, chat_id: ChatId, diff --git a/src/contact.rs b/src/contact.rs index 62dac0262..3e7eacb7a 100644 --- a/src/contact.rs +++ b/src/contact.rs @@ -802,7 +802,6 @@ impl Contact { } let mut name = sanitize_name(name); - #[allow(clippy::collapsible_if)] if origin <= Origin::OutgoingTo { // The user may accidentally have written to a "noreply" address with another MUA: if addr.contains("noreply") diff --git a/src/imap.rs b/src/imap.rs index 8d6304781..aac2bb944 100644 --- a/src/imap.rs +++ b/src/imap.rs @@ -1331,7 +1331,7 @@ impl Session { /// Returns the last UID fetched successfully and the info about each downloaded message. /// If the message is incorrect or there is a failure to write a message to the database, /// it is skipped and the error is logged. - #[allow(clippy::too_many_arguments)] + #[expect(clippy::too_many_arguments)] pub(crate) async fn fetch_many_msgs( &mut self, context: &Context, @@ -2726,7 +2726,6 @@ mod tests { } } - #[allow(clippy::too_many_arguments)] async fn check_target_folder_combination( folder: &str, mvbox_move: bool, diff --git a/src/mimefactory.rs b/src/mimefactory.rs index 5e5983427..5926a1e98 100644 --- a/src/mimefactory.rs +++ b/src/mimefactory.rs @@ -1150,7 +1150,6 @@ impl MimeFactory { part.body(text) } - #[allow(clippy::cognitive_complexity)] async fn render_message( &mut self, context: &Context, diff --git a/src/mimeparser.rs b/src/mimeparser.rs index 709650ffb..03c7cd40b 100644 --- a/src/mimeparser.rs +++ b/src/mimeparser.rs @@ -1290,7 +1290,7 @@ impl MimeMessage { Ok(self.parts.len() > old_part_count) } - #[allow(clippy::too_many_arguments)] + #[expect(clippy::too_many_arguments)] async fn do_add_single_file_part( &mut self, context: &Context, diff --git a/src/param.rs b/src/param.rs index 920035728..6adf2b052 100644 --- a/src/param.rs +++ b/src/param.rs @@ -373,7 +373,6 @@ impl Params { /// Note that in the [ParamsFile::FsPath] case the blob can be /// created without copying if the path already refers to a valid /// blob. If so a [BlobObject] will be returned. - #[allow(clippy::needless_lifetimes)] pub async fn get_blob<'a>( &self, key: Param, diff --git a/src/pgp.rs b/src/pgp.rs index f729237d9..804d520c0 100644 --- a/src/pgp.rs +++ b/src/pgp.rs @@ -21,11 +21,9 @@ use tokio::runtime::Handle; use crate::constants::KeyGenType; use crate::key::{DcKey, Fingerprint}; -#[allow(missing_docs)] #[cfg(test)] pub(crate) const HEADER_AUTOCRYPT: &str = "autocrypt-prefer-encrypt"; -#[allow(missing_docs)] pub const HEADER_SETUPCODE: &str = "passphrase-begin"; /// Preferred symmetric encryption algorithm. diff --git a/src/quota.rs b/src/quota.rs index 0070a76ca..a0e8df346 100644 --- a/src/quota.rs +++ b/src/quota.rs @@ -187,7 +187,7 @@ mod tests { Ok(()) } - #[allow(clippy::assertions_on_constants)] + #[expect(clippy::assertions_on_constants)] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn test_quota_thresholds() -> anyhow::Result<()> { assert!(QUOTA_ALLCLEAR_PERCENTAGE > 50); diff --git a/src/receive_imf.rs b/src/receive_imf.rs index 01edd0075..76c9934ae 100644 --- a/src/receive_imf.rs +++ b/src/receive_imf.rs @@ -158,7 +158,7 @@ async fn insert_tombstone(context: &Context, rfc724_mid: &str) -> Result /// If `is_partial_download` is set, it contains the full message size in bytes. /// Do not confuse that with `replace_msg_id` that will be set when the full message is loaded /// later. -#[allow(clippy::too_many_arguments)] +#[expect(clippy::too_many_arguments)] pub(crate) async fn receive_imf_inner( context: &Context, folder: &str, @@ -696,7 +696,7 @@ pub async fn from_field_to_contact_id( /// Creates a `ReceivedMsg` from given parts which might consist of /// multiple messages (if there are multiple attachments). /// Every entry in `mime_parser.parts` produces a new row in the `msgs` table. -#[allow(clippy::too_many_arguments, clippy::cognitive_complexity)] +#[expect(clippy::too_many_arguments)] async fn add_parts( context: &Context, mime_parser: &mut MimeMessage, @@ -1843,7 +1843,7 @@ async fn lookup_chat_by_reply( Ok(Some((parent_chat.id, parent_chat.blocked))) } -#[allow(clippy::too_many_arguments)] +#[expect(clippy::too_many_arguments)] async fn lookup_chat_or_create_adhoc_group( context: &Context, mime_parser: &MimeMessage, @@ -1988,7 +1988,7 @@ async fn is_probably_private_reply( /// than two members, a new ad hoc group is created. /// /// On success the function returns the created (chat_id, chat_blocked) tuple. -#[allow(clippy::too_many_arguments)] +#[expect(clippy::too_many_arguments)] async fn create_group( context: &Context, mime_parser: &mut MimeMessage, @@ -2205,7 +2205,6 @@ async fn update_chats_contacts_timestamps( /// /// * `to_ids` - contents of the `To` and `Cc` headers. /// * `past_ids` - contents of the `Chat-Group-Past-Members` header. -#[allow(clippy::too_many_arguments)] async fn apply_group_changes( context: &Context, mime_parser: &mut MimeMessage, diff --git a/src/smtp.rs b/src/smtp.rs index d50466d3c..945196b7a 100644 --- a/src/smtp.rs +++ b/src/smtp.rs @@ -103,7 +103,7 @@ impl Smtp { } /// Connect using the provided login params. - #[allow(clippy::too_many_arguments)] + #[expect(clippy::too_many_arguments)] pub async fn connect( &mut self, context: &Context, diff --git a/src/smtp/connect.rs b/src/smtp/connect.rs index 5652d1427..869405cd3 100644 --- a/src/smtp/connect.rs +++ b/src/smtp/connect.rs @@ -45,7 +45,7 @@ async fn new_smtp_transport( Ok(transport) } -#[allow(clippy::too_many_arguments)] +#[expect(clippy::too_many_arguments)] pub(crate) async fn connect_and_auth( context: &Context, proxy_config: &Option,