From 1fdd1ab23ab40daef04f0b1b651e5e98155b2be0 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@matrix.org>
Date: Wed, 11 May 2022 11:57:27 +0200
Subject: [PATCH] Cleanup after rebase

---
 crates/matrix-sdk-ffi/Cargo.toml      | 2 +-
 crates/matrix-sdk-ffi/src/client.rs   | 2 +-
 crates/matrix-sdk-ffi/src/messages.rs | 2 +-
 crates/matrix-sdk-ffi/src/room.rs     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/matrix-sdk-ffi/Cargo.toml b/crates/matrix-sdk-ffi/Cargo.toml
index 0682f5a54..015d8d860 100644
--- a/crates/matrix-sdk-ffi/Cargo.toml
+++ b/crates/matrix-sdk-ffi/Cargo.toml
@@ -24,7 +24,7 @@ anyhow = "1.0.51"
 extension-trait = "1.0.1"
 futures-core = "0.3.17"
 futures-util = { version = "0.3.17", default-features = false }
-matrix-sdk = { path = "../matrix-sdk", features = ["markdown"] }
+matrix-sdk = { path = "../matrix-sdk", features = ["experimental-timeline", "markdown"] }
 once_cell = "1.10.0"
 parking_lot = "0.12.0"
 sanitize-filename-reader-friendly = "2.2.1"
diff --git a/crates/matrix-sdk-ffi/src/client.rs b/crates/matrix-sdk-ffi/src/client.rs
index 3d90ebf55..ef7cf5e0d 100644
--- a/crates/matrix-sdk-ffi/src/client.rs
+++ b/crates/matrix-sdk-ffi/src/client.rs
@@ -164,5 +164,5 @@ impl Client {
 }
 
 pub fn gen_transaction_id() -> String {
-    TransactionId::new().into()
+    TransactionId::new().to_string()
 }
diff --git a/crates/matrix-sdk-ffi/src/messages.rs b/crates/matrix-sdk-ffi/src/messages.rs
index 96eb7489a..5730ff98d 100644
--- a/crates/matrix-sdk-ffi/src/messages.rs
+++ b/crates/matrix-sdk-ffi/src/messages.rs
@@ -154,7 +154,7 @@ pub fn sync_event_to_message(sync_event: SyncRoomEvent) -> Option<Arc<AnyMessage
                 body: m.content.body().to_owned(),
                 sender: m.sender.to_string(),
                 origin_server_ts: m.origin_server_ts.as_secs().into(),
-                transaction_id: m.unsigned.transaction_id.map(Into::into),
+                transaction_id: m.unsigned.transaction_id.map(|txn_id| txn_id.to_string()),
             });
 
             match m.content.msgtype {
diff --git a/crates/matrix-sdk-ffi/src/room.rs b/crates/matrix-sdk-ffi/src/room.rs
index da31916b9..deacfe541 100644
--- a/crates/matrix-sdk-ffi/src/room.rs
+++ b/crates/matrix-sdk-ffi/src/room.rs
@@ -47,7 +47,7 @@ impl Room {
 
     pub fn display_name(&self) -> Result<String> {
         let r = self.room.clone();
-        RUNTIME.block_on(async move { Ok(r.display_name().await?) })
+        RUNTIME.block_on(async move { Ok(r.display_name().await?.to_string()) })
     }
 
     pub fn topic(&self) -> Option<String> {