chore: Fix new nightly warnings

neodyme-labs · Jan 9, 2025 · 6c053a8 · 6c053a8
1 parent 0cae54c
commit 6c053a8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/bindings/matrix-sdk-ffi/src/timeline/mod.rs b/bindings/matrix-sdk-ffi/src/timeline/mod.rs
@@ -123,7 +123,7 @@ impl Timeline {
             .thumbnail(thumbnail)
             .info(attachment_info)
             .caption(params.caption)
-            .formatted_caption(formatted_caption.map(Into::into))
+            .formatted_caption(formatted_caption)
             .mentions(params.mentions.map(Into::into));
 
         let handle = SendAttachmentJoinHandle::new(RUNTIME.spawn(async move {

diff --git a/crates/matrix-sdk-common/src/linked_chunk/as_vector.rs b/crates/matrix-sdk-common/src/linked_chunk/as_vector.rs
@@ -803,7 +803,7 @@ mod tests {
         assert_items_eq!(linked_chunk, ['a', 'b', 'c'] ['d']);
 
         // Empty updates first.
-        let _ = linked_chunk.updates().take();
+        let _ = linked_chunk.updates().unwrap().take();
 
         // Start observing future updates.
         let mut as_vector = linked_chunk.as_vector().unwrap();

diff --git a/crates/matrix-sdk/src/oidc/mod.rs b/crates/matrix-sdk/src/oidc/mod.rs
@@ -1160,8 +1160,7 @@ impl Oidc {
                 #[cfg(feature = "e2e-encryption")]
                 None,
             )
-            .await
-            .map_err(crate::Error::from)?;
+            .await?;
         // At this point the Olm machine has been set up.
 
         // Enable the cross-process lock for refreshes, if needs be.
@@ -1313,8 +1312,7 @@ impl Oidc {
                 refresh_token.clone(),
                 latest_id_token.clone(),
             )
-            .await
-            .map_err(OidcError::from)?;
+            .await?;
 
         trace!(
             "Token refresh: new refresh_token: {} / access_token: {:x}",

diff --git a/examples/persist_session/src/main.rs b/examples/persist_session/src/main.rs
@@ -77,7 +77,7 @@ async fn main() -> anyhow::Result<()> {
         (login(&data_dir, &session_file).await?, None)
     };
 
-    sync(client, sync_token, &session_file).await.map_err(Into::into)
+    sync(client, sync_token, &session_file).await
 }
 
 /// Restore a previous session.