From f45ceedb8ac67c3b9b6dccb4572b19313594a784 Mon Sep 17 00:00:00 2001 From: nexy7574 Date: Fri, 26 Sep 2025 18:41:25 +0100 Subject: [PATCH] fix(upgrade): Potentially resolve CI clippy errors I'm not convinced this isn't a rust bug itself, but CI was complaining about lifetimes and those complaints couldn't be reproduced locally, so this should probably fix it maybe? --- src/api/client/room/upgrade.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/api/client/room/upgrade.rs b/src/api/client/room/upgrade.rs index 87044cdd..2527aaa3 100644 --- a/src/api/client/room/upgrade.rs +++ b/src/api/client/room/upgrade.rs @@ -97,11 +97,12 @@ pub(crate) async fn upgrade_room_route( // Create a replacement room let room_features = RoomVersion::new(&body.new_version)?; - let replacement_room: Option<&RoomId> = if room_features.room_ids_as_hashes { - None + let replacement_room_owned = if !room_features.room_ids_as_hashes { + Some(RoomId::new(services.globals.server_name())) } else { - Some(&RoomId::new(services.globals.server_name())) + None }; + let replacement_room: Option<&RoomId> = replacement_room_owned.as_ref().map(AsRef::as_ref); let replacement_room_tmp = match replacement_room { | Some(v) => v, | None => &RoomId::new(services.globals.server_name()),