From 58bb2dc21e2c38cee30ab94c65c249eb408e3a33 Mon Sep 17 00:00:00 2001
From: Ivan Enderlin <ivan@mnt.io>
Date: Thu, 27 Apr 2023 14:16:48 +0200
Subject: [PATCH] chore: Fix PR feedbacks.

---
 bindings/matrix-sdk-ffi/src/client.rs         | 11 +----------
 bindings/matrix-sdk-ffi/src/sliding_sync.rs   |  4 ++--
 crates/matrix-sdk/src/sliding_sync/builder.rs |  5 ++---
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/bindings/matrix-sdk-ffi/src/client.rs b/bindings/matrix-sdk-ffi/src/client.rs
index 19ca66c4d..bff556779 100644
--- a/bindings/matrix-sdk-ffi/src/client.rs
+++ b/bindings/matrix-sdk-ffi/src/client.rs
@@ -1,7 +1,4 @@
-use std::{
-    fmt,
-    sync::{Arc, RwLock},
-};
+use std::sync::{Arc, RwLock};
 
 use anyhow::{anyhow, Context};
 use eyeball::shared::Observable as SharedObservable;
@@ -121,12 +118,6 @@ pub struct Client {
     pub(crate) sliding_sync_reset_broadcast_tx: Arc<SharedObservable<()>>,
 }
 
-impl fmt::Debug for Client {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        formatter.debug_struct("Client").field("client", &self.client).finish_non_exhaustive()
-    }
-}
-
 impl Client {
     pub fn new(client: MatrixClient) -> Self {
         let session_verification_controller: Arc<
diff --git a/bindings/matrix-sdk-ffi/src/sliding_sync.rs b/bindings/matrix-sdk-ffi/src/sliding_sync.rs
index 47bdf2941..b748bf961 100644
--- a/bindings/matrix-sdk-ffi/src/sliding_sync.rs
+++ b/bindings/matrix-sdk-ffi/src/sliding_sync.rs
@@ -782,7 +782,7 @@ impl SlidingSync {
     }
 }
 
-#[derive(Debug, Clone, uniffi::Object)]
+#[derive(Clone, uniffi::Object)]
 pub struct SlidingSyncBuilder {
     inner: MatrixSlidingSyncBuilder,
     client: Client,
@@ -804,7 +804,7 @@ impl SlidingSyncBuilder {
 
     pub fn add_list(self: Arc<Self>, list_builder: Arc<SlidingSyncListBuilder>) -> Arc<Self> {
         let mut builder = unwrap_or_clone_arc(self);
-        builder.inner = builder.inner.add_list(unwrap_or_clone_arc(list_builder).inner).unwrap();
+        builder.inner = builder.inner.add_list(unwrap_or_clone_arc(list_builder).inner);
         Arc::new(builder)
     }
 
diff --git a/crates/matrix-sdk/src/sliding_sync/builder.rs b/crates/matrix-sdk/src/sliding_sync/builder.rs
index 0b28df18b..857b011a3 100644
--- a/crates/matrix-sdk/src/sliding_sync/builder.rs
+++ b/crates/matrix-sdk/src/sliding_sync/builder.rs
@@ -72,10 +72,9 @@ impl SlidingSyncBuilder {
     /// Add the given list to the lists.
     ///
     /// Replace any list with the name.
-    pub fn add_list(mut self, list_builder: SlidingSyncListBuilder) -> Result<Self> {
+    pub fn add_list(mut self, list_builder: SlidingSyncListBuilder) -> Self {
         self.lists.push(list_builder);
-
-        Ok(self)
+        self
     }
 
     /// Activate e2ee, to-device-message and account data extensions if not yet