From 6e0152d4e5458f6d776814a7670922e31de24ff4 Mon Sep 17 00:00:00 2001 From: Lambda Date: Fri, 21 Feb 2025 20:44:45 +0000 Subject: [PATCH] Update to edition 2024 --- Cargo.toml | 3 +-- src/database/key_value/rooms/user.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 40029de4..a5251296 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,6 @@ unused_import_braces = "warn" unused_lifetimes = "warn" unused_macro_rules = "warn" unused_qualifications = "warn" -rust-2024-compatibility = "warn" [workspace.lints.clippy] # Groups. Keep alphabetically sorted @@ -79,7 +78,7 @@ name = "grapevine" description = "A Matrix homeserver written in Rust" license = "Apache-2.0" version = "0.1.0" -edition = "2021" +edition = "2024" # See also `rust-toolchain.toml` rust-version = "1.85.0" diff --git a/src/database/key_value/rooms/user.rs b/src/database/key_value/rooms/user.rs index b474def3..09d87378 100644 --- a/src/database/key_value/rooms/user.rs +++ b/src/database/key_value/rooms/user.rs @@ -156,7 +156,7 @@ impl service::rooms::user::Data for KeyValueDatabase { let roomid_index = key .iter() .enumerate() - .find(|(_, &b)| b == 0xFF) + .find(|&(_, &b)| b == 0xFF) .ok_or_else(|| { Error::bad_database( "Invalid userroomid_joined in db.",