chore: upgrade rust

this is needed for recent versions of ruma

Cargo.toml

@@ -19,7 +19,7 @@ repository = "https://gitlab.com/famedly/conduit"
 version = "0.10.0-alpha"
 
 # See also `rust-toolchain.toml`
-rust-version = "1.79.0"
+rust-version = "1.80.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

complement/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.79.0
+FROM rust:1.80.0
 
 WORKDIR /workdir
 

flake.nix

@@ -59,7 +59,7 @@
             file = ./rust-toolchain.toml;
 
             # See also `rust-toolchain.toml`
-            sha256 = "sha256-Ngiz76YP4HTY75GGdH2P+APE/DEIx2R/Dn+BwwOyzZU=";
+            sha256 = "sha256-6eN/GKzjVSjEhGO9FhWObkRFaE1Jf+uqMSdQnb8lcB4=";
           };
       });
     in

rust-toolchain.toml

@@ -9,7 +9,7 @@
 # If you're having trouble making the relevant changes, bug a maintainer.
 
 [toolchain]
-channel = "1.79.0"
+channel = "1.80.0"
 components = [
   # For rust-analyzer
   "rust-src",

src/database/key_value/rooms/edus/read_receipt.rs

@@ -1,5 +1,3 @@
-use std::mem;
-
 use ruma::{
     events::receipt::ReceiptEvent, serde::Raw, CanonicalJsonObject, OwnedUserId, RoomId, UserId,
 };
@@ -73,12 +71,13 @@ impl service::rooms::edus::read_receipt::Data for KeyValueDatabase {
                 .iter_from(&first_possible_edu, false)
                 .take_while(move |(k, _)| k.starts_with(&prefix2))
                 .map(move |(k, v)| {
-                    let count = utils::u64_from_bytes(
+                    let count =
-                        &k[prefix.len()..prefix.len() + mem::size_of::<u64>()],
+                        utils::u64_from_bytes(&k[prefix.len()..prefix.len() + size_of::<u64>()])
-                    )
+                            .map_err(|_| {
-                    .map_err(|_| Error::bad_database("Invalid readreceiptid count in db."))?;
+                                Error::bad_database("Invalid readreceiptid count in db.")
+                            })?;
                     let user_id = UserId::parse(
-                        utils::string_from_bytes(&k[prefix.len() + mem::size_of::<u64>() + 1..])
+                        utils::string_from_bytes(&k[prefix.len() + size_of::<u64>() + 1..])
                             .map_err(|_| {
                                 Error::bad_database("Invalid readreceiptid userid bytes in db.")
                             })?,

src/database/key_value/rooms/pdu_metadata.rs

@@ -1,4 +1,4 @@
-use std::{mem, sync::Arc};
+use std::sync::Arc;
 
 use ruma::{EventId, RoomId, UserId};
 
@@ -40,7 +40,7 @@ impl service::rooms::pdu_metadata::Data for KeyValueDatabase {
                 .iter_from(&current, true)
                 .take_while(move |(k, _)| k.starts_with(&prefix))
                 .map(move |(tofrom, _data)| {
-                    let from = utils::u64_from_bytes(&tofrom[(mem::size_of::<u64>())..])
+                    let from = utils::u64_from_bytes(&tofrom[(size_of::<u64>())..])
                         .map_err(|_| Error::bad_database("Invalid count in tofrom_relation."))?;
 
                     let mut pduid = shortroomid.to_be_bytes().to_vec();

src/database/key_value/rooms/threads.rs

@@ -1,5 +1,3 @@
-use std::mem;
-
 use ruma::{api::client::threads::get_threads::v1::IncludeThreads, OwnedUserId, RoomId, UserId};
 
 use crate::{database::KeyValueDatabase, service, services, utils, Error, PduEvent, Result};
@@ -28,7 +26,7 @@ impl service::rooms::threads::Data for KeyValueDatabase {
                 .iter_from(&current, true)
                 .take_while(move |(k, _)| k.starts_with(&prefix))
                 .map(move |(pduid, _users)| {
-                    let count = utils::u64_from_bytes(&pduid[(mem::size_of::<u64>())..])
+                    let count = utils::u64_from_bytes(&pduid[(size_of::<u64>())..])
                         .map_err(|_| Error::bad_database("Invalid pduid in threadid_userids."))?;
                     let mut pdu = services()
                         .rooms