From 6f805d258449c5f94c7aac073f7bf6af0bed36e9 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 8 Aug 2020 16:36:13 +0200 Subject: [PATCH] client-api: Simplify `r0::room::create_room::CreationContent::into_event_content` using the assign crate --- ruma-client-api/Cargo.toml | 1 + ruma-client-api/src/r0/room/create_room.rs | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ruma-client-api/Cargo.toml b/ruma-client-api/Cargo.toml index 50014f5a..c6775af4 100644 --- a/ruma-client-api/Cargo.toml +++ b/ruma-client-api/Cargo.toml @@ -17,6 +17,7 @@ version = "0.10.0-alpha.1" edition = "2018" [dependencies] +assign = "1.1.0" http = "0.2.1" js_int = { version = "0.1.9", features = ["serde"] } ruma-api = { version = "=0.17.0-alpha.1", path = "../ruma-api" } diff --git a/ruma-client-api/src/r0/room/create_room.rs b/ruma-client-api/src/r0/room/create_room.rs index 488d0873..557d5904 100644 --- a/ruma-client-api/src/r0/room/create_room.rs +++ b/ruma-client-api/src/r0/room/create_room.rs @@ -1,5 +1,6 @@ //! [POST /_matrix/client/r0/createRoom](https://matrix.org/docs/spec/client_server/r0.6.0#post-matrix-client-r0-createroom) +use assign::assign; use ruma_api::ruma_api; use ruma_common::Raw; use ruma_events::{ @@ -141,11 +142,7 @@ impl CreationContent { creator: UserId, room_version: RoomVersionId, ) -> CreateEventContent { - let mut res = CreateEventContent::new(creator); - res.federate = federate; - res.room_version = room_version; - res.predecessor = predecessor; - res + assign!(CreateEventContent::new(creator), { federate, room_version, predecessor }) } }