Skip to content

Commit 67e16d0

Browse files
committed
Merge <#6346>
Downgrade Rust used for release builds.
2 parents 6cd6aca + 5069b58 commit 67e16d0

File tree

15 files changed

+88
-22
lines changed

15 files changed

+88
-22
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ jobs:
103103
- os: macos-latest
104104
rust: 1.83.0
105105

106-
# Minimum Supported Rust Version = 1.81.0
106+
# Minimum Supported Rust Version = 1.77.0
107107
- os: ubuntu-latest
108-
rust: 1.81.0
108+
rust: 1.77.0
109109
runs-on: ${{ matrix.os }}
110110
steps:
111111
- uses: actions/checkout@v4

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "deltachat"
33
version = "1.152.0"
44
edition = "2021"
55
license = "MPL-2.0"
6-
rust-version = "1.81"
6+
rust-version = "1.77"
77
repository = "https://github.com/deltachat/deltachat-core-rust"
88

99
[profile.dev]

flake.lock

Lines changed: 58 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
{
22
description = "Delta Chat core";
33
inputs = {
4-
fenix.url = "github:nix-community/fenix";
4+
# Old Rust to build releases.
5+
fenix.url = "github:nix-community/fenix?rev=85f4139f3c092cf4afd9f9906d7ed218ef262c97";
6+
7+
# New Rust for development shell.
8+
new-fenix.url = "github:nix-community/fenix";
9+
510
flake-utils.url = "github:numtide/flake-utils";
611
naersk.url = "github:nix-community/naersk";
712
nix-filter.url = "github:numtide/nix-filter";
813
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
914
android.url = "github:tadfisher/android-nixpkgs";
1015
};
11-
outputs = { self, nixpkgs, flake-utils, nix-filter, naersk, fenix, android }:
16+
outputs = { self, nixpkgs, flake-utils, nix-filter, naersk, fenix, new-fenix, android }:
1217
flake-utils.lib.eachDefaultSystem (system:
1318
let
1419
pkgs = nixpkgs.legacyPackages.${system};
@@ -539,13 +544,13 @@
539544
let
540545
pkgs = import nixpkgs {
541546
system = system;
542-
overlays = [ fenix.overlays.default ];
547+
overlays = [ new-fenix.overlays.default ];
543548
};
544549
in
545550
pkgs.mkShell {
546551

547552
buildInputs = with pkgs; [
548-
(fenix.packages.${system}.complete.withComponents [
553+
(new-fenix.packages.${system}.complete.withComponents [
549554
"cargo"
550555
"clippy"
551556
"rust-src"

src/chat.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ impl ChatId {
312312

313313
/// Create a group or mailinglist raw database record with the given parameters.
314314
/// The function does not add SELF nor checks if the record already exists.
315-
#[expect(clippy::too_many_arguments)]
315+
#[allow(clippy::too_many_arguments)]
316316
pub(crate) async fn create_multiuser_record(
317317
context: &Context,
318318
chattype: Chattype,
@@ -4444,7 +4444,7 @@ pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Resul
44444444
///
44454445
/// For example, it can be a message showing that a member was added to a group.
44464446
/// Doesn't fail if the chat doesn't exist.
4447-
#[expect(clippy::too_many_arguments)]
4447+
#[allow(clippy::too_many_arguments)]
44484448
pub(crate) async fn add_info_msg_with_cmd(
44494449
context: &Context,
44504450
chat_id: ChatId,

src/contact.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,7 @@ impl Contact {
805805
}
806806

807807
let mut name = sanitize_name(name);
808+
#[allow(clippy::collapsible_if)]
808809
if origin <= Origin::OutgoingTo {
809810
// The user may accidentally have written to a "noreply" address with another MUA:
810811
if addr.contains("noreply")

src/imap.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,7 @@ impl Session {
13011301
/// Returns the last UID fetched successfully and the info about each downloaded message.
13021302
/// If the message is incorrect or there is a failure to write a message to the database,
13031303
/// it is skipped and the error is logged.
1304-
#[expect(clippy::too_many_arguments)]
1304+
#[allow(clippy::too_many_arguments)]
13051305
pub(crate) async fn fetch_many_msgs(
13061306
&mut self,
13071307
context: &Context,
@@ -2689,6 +2689,7 @@ mod tests {
26892689
}
26902690
}
26912691

2692+
#[allow(clippy::too_many_arguments)]
26922693
async fn check_target_folder_combination(
26932694
folder: &str,
26942695
mvbox_move: bool,

src/mimefactory.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,6 +1047,7 @@ impl MimeFactory {
10471047
part.body(text)
10481048
}
10491049

1050+
#[allow(clippy::cognitive_complexity)]
10501051
async fn render_message(
10511052
&mut self,
10521053
context: &Context,

src/mimeparser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1279,7 +1279,7 @@ impl MimeMessage {
12791279
Ok(self.parts.len() > old_part_count)
12801280
}
12811281

1282-
#[expect(clippy::too_many_arguments)]
1282+
#[allow(clippy::too_many_arguments)]
12831283
async fn do_add_single_file_part(
12841284
&mut self,
12851285
context: &Context,

src/param.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ impl Params {
371371
/// Note that in the [ParamsFile::FsPath] case the blob can be
372372
/// created without copying if the path already refers to a valid
373373
/// blob. If so a [BlobObject] will be returned.
374+
#[allow(clippy::needless_lifetimes)]
374375
pub async fn get_blob<'a>(
375376
&self,
376377
key: Param,

0 commit comments

Comments
 (0)