Skip to content

Commit 883dbeb

Browse files
Update rust edition to 2024 (#379)
* Update rust edition to 2024 * Fix tag looping issue and import orders
1 parent f463ed8 commit 883dbeb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+154
-145
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "whitenoise"
33
version = "0.1.0"
44
description = "A secure messenger built on MLS and Nostr"
55
authors = ["White Noise Authors"]
6-
edition = "2021"
6+
edition = "2024"
77
rust-version = "1.90.0"
88

99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

rustfmt.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Default settings for rustfmt
2-
edition = "2021" # Specify your Rust edition
2+
edition = "2024" # Specify your Rust edition
33
max_width = 100 # Maximum line width
44
tab_spaces = 4 # Number of spaces per tab
55
newline_style = "Unix" # Line ending style

src/integration_tests/core/traits.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::integration_tests::core::{ScenarioContext, ScenarioResult};
21
use crate::WhitenoiseError;
2+
use crate::integration_tests::core::{ScenarioContext, ScenarioResult};
33
use async_trait::async_trait;
44
use std::time::Instant;
55

src/integration_tests/test_cases/account_management/logout_account.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::integration_tests::core::*;
21
use crate::WhitenoiseError;
2+
use crate::integration_tests::core::*;
33
use async_trait::async_trait;
44

55
pub struct LogoutAccountTestCase {

src/integration_tests/test_cases/advanced_messaging/aggregate_messages.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::integration_tests::core::*;
21
use crate::WhitenoiseError;
2+
use crate::integration_tests::core::*;
33
use async_trait::async_trait;
44

55
pub struct AggregateMessagesTestCase {

src/integration_tests/test_cases/advanced_messaging/delete_message.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::integration_tests::core::*;
21
use crate::WhitenoiseError;
2+
use crate::integration_tests::core::*;
33
use async_trait::async_trait;
44
use nostr_sdk::prelude::*;
55

src/integration_tests/test_cases/follow_management/follow_user.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
use crate::integration_tests::core::*;
2-
use crate::WhitenoiseError;
31
use async_trait::async_trait;
42
use nostr_sdk::PublicKey;
53

4+
use crate::WhitenoiseError;
5+
use crate::integration_tests::core::*;
6+
67
pub struct FollowUserTestCase {
78
follower_account_name: String,
89
target_pubkey: PublicKey,

src/integration_tests/test_cases/follow_management/unfollow_user.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
use crate::integration_tests::core::*;
2-
use crate::WhitenoiseError;
31
use async_trait::async_trait;
42
use nostr_sdk::PublicKey;
53

4+
use crate::WhitenoiseError;
5+
use crate::integration_tests::core::*;
6+
67
pub struct UnfollowUserTestCase {
78
follower_account_name: String,
89
target_pubkey: PublicKey,

src/integration_tests/test_cases/group_membership/add_group_members.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::integration_tests::core::*;
21
use crate::WhitenoiseError;
2+
use crate::integration_tests::core::*;
33
use async_trait::async_trait;
44
use mdk_core::prelude::GroupId;
55
use nostr_sdk::PublicKey;

src/integration_tests/test_cases/group_membership/remove_group_members.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::integration_tests::core::*;
21
use crate::WhitenoiseError;
2+
use crate::integration_tests::core::*;
33
use async_trait::async_trait;
44
use mdk_core::prelude::GroupId;
55
use nostr_sdk::PublicKey;

0 commit comments

Comments
 (0)