Corrections after merge

Author: Daniel Salinas

bindings/matrix-sdk-ffi/src/client_builder.rs

@@ -1,21 +1,28 @@
 use std::{fs, num::NonZeroUsize, path::Path, sync::Arc, time::Duration};
 
 use futures_util::StreamExt;
-#[cfg(not(target_family = "wasm"))]
-use matrix_sdk::{
-  reqwest::{Certificate, Proxy},
-  SqliteStoreConfig
-};
 use matrix_sdk::{
-    authentication::oauth::qrcode::{self, DeviceCodeErrorResponseType, LoginFailureReason}, crypto::{
+    authentication::oauth::qrcode::{self, DeviceCodeErrorResponseType, LoginFailureReason},
+    crypto::{
         types::qr_login::{LoginQrCodeDecodeError, QrCodeModeData},
         CollectStrategy, TrustRequirement,
-    }, encryption::{BackupDownloadStrategy, EncryptionSettings}, event_cache::EventCacheError, ruma::{ServerName, UserId}, sliding_sync::{
+    },
+    encryption::{BackupDownloadStrategy, EncryptionSettings},
+    event_cache::EventCacheError,
+    ruma::{ServerName, UserId},
+    sliding_sync::{
         Error as MatrixSlidingSyncError, VersionBuilder as MatrixSlidingSyncVersionBuilder,
         VersionBuilderError,
-    }, Client as MatrixClient, ClientBuildError as MatrixClientBuildError, HttpError, IdParseError, RumaApiError, SendOutsideWasm, SyncOutsideWasm
+    },
+    Client as MatrixClient, ClientBuildError as MatrixClientBuildError, HttpError, IdParseError,
+    RumaApiError, SendOutsideWasm, SyncOutsideWasm,
+};
+#[cfg(not(target_family = "wasm"))]
+use matrix_sdk::{
+    reqwest::{Certificate, Proxy},
+    SqliteStoreConfig,
 };
-use matrix_sdk_common::{runtime::get_runtime_handle, SendOutsideWasm, SyncOutsideWasm};
+use matrix_sdk_common::runtime::get_runtime_handle;
 use ruma::api::error::{DeserializationError, FromHttpResponseError};
 use tracing::{debug, error};
 use zeroize::Zeroizing;

bindings/matrix-sdk-ffi/src/platform.rs

@@ -567,26 +567,26 @@ fn setup_lightweight_tokio_runtime() {
     async_compat::set_runtime_builder(Box::new(|| {
         eprintln!("spawning a lightweight tokio runtime");
 
-          // Get the number of available cores through the system, if possible.
-          let num_available_cores =
-              std::thread::available_parallelism().map(|n| n.get()).unwrap_or(1);
-
-          // The number of worker threads will be either that or 4, whichever is smaller.
-          let num_worker_threads = num_available_cores.min(4);
-
-          // Chosen by a fair dice roll.
-          let num_blocking_threads = 2;
-
-          // 1 MiB of memory per worker thread. Should be enough for everyone™.
-          let max_memory_bytes = 1024 * 1024;
-
-          let mut builder = tokio::runtime::Builder::new_multi_thread();
-          builder
-              .enable_all()
-              .worker_threads(num_worker_threads)
-              .thread_stack_size(max_memory_bytes)
-              .max_blocking_threads(num_blocking_threads);
-          builder
+        // Get the number of available cores through the system, if possible.
+        let num_available_cores =
+            std::thread::available_parallelism().map(|n| n.get()).unwrap_or(1);
+
+        // The number of worker threads will be either that or 4, whichever is smaller.
+        let num_worker_threads = num_available_cores.min(4);
+
+        // Chosen by a fair dice roll.
+        let num_blocking_threads = 2;
+
+        // 1 MiB of memory per worker thread. Should be enough for everyone™.
+        let max_memory_bytes = 1024 * 1024;
+
+        let mut builder = tokio::runtime::Builder::new_multi_thread();
+        builder
+            .enable_all()
+            .worker_threads(num_worker_threads)
+            .thread_stack_size(max_memory_bytes)
+            .max_blocking_threads(num_blocking_threads);
+        builder
     }));
 }
 

bindings/matrix-sdk-ffi/src/timeline/mod.rs

@@ -30,8 +30,10 @@ use matrix_sdk::{
         reply::{EnforceThread, Reply},
     },
 };
-use matrix_sdk_common::executor::{AbortHandle, JoinHandle};
-use matrix_sdk_common::runtime::get_runtime_handle;
+use matrix_sdk_common::{
+    executor::{AbortHandle, JoinHandle},
+    runtime::get_runtime_handle,
+};
 use matrix_sdk_ui::timeline::{
     self, AttachmentSource, EventItemOrigin, Profile, TimelineDetails,
     TimelineUniqueId as SdkTimelineUniqueId,

crates/matrix-sdk/src/client/futures.rs

@@ -16,8 +16,7 @@
 
 use std::{fmt::Debug, future::IntoFuture};
 
-use eyeball::SharedObservable;
-use eyeball::Subscriber;
+use eyeball::{SharedObservable, Subscriber};
 use js_int::UInt;
 use matrix_sdk_common::{boxed_into_future, SendOutsideWasm, SyncOutsideWasm};
 use oauth2::{basic::BasicErrorResponseType, RequestTokenError};

crates/matrix-sdk/src/encryption/futures.rs

@@ -19,8 +19,7 @@
 
 use std::{future::IntoFuture, io::Read};
 
-use eyeball::SharedObservable;
-use eyeball::Subscriber;
+use eyeball::{SharedObservable, Subscriber};
 use matrix_sdk_common::boxed_into_future;
 use ruma::events::room::{EncryptedFile, EncryptedFileInit};