feat(wasm): Eliminate some unecessary wasm removals from matrix-sdk crate (#5169)

Author: zzorba

crates/matrix-sdk/src/authentication/oauth/mod.rs

@@ -174,7 +174,7 @@ use error::{
     OAuthAuthorizationCodeError, OAuthClientRegistrationError, OAuthDiscoveryError,
     OAuthTokenRevocationError, RedirectUriQueryParseError,
 };
-#[cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+#[cfg(feature = "e2e-encryption")]
 use matrix_sdk_base::crypto::types::qr_login::QrCodeData;
 #[cfg(feature = "e2e-encryption")]
 use matrix_sdk_base::once_cell::sync::OnceCell;
@@ -208,15 +208,15 @@ mod cross_process;
 pub mod error;
 mod http_client;
 mod oidc_discovery;
-#[cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+#[cfg(feature = "e2e-encryption")]
 pub mod qrcode;
 pub mod registration;
 #[cfg(all(test, not(target_family = "wasm")))]
 mod tests;
 
 #[cfg(feature = "e2e-encryption")]
 use self::cross_process::{CrossProcessRefreshLockGuard, CrossProcessRefreshManager};
-#[cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+#[cfg(feature = "e2e-encryption")]
 use self::qrcode::LoginWithQrCode;
 pub use self::{
     account_management_url::{AccountManagementActionFull, AccountManagementUrlBuilder},
@@ -454,7 +454,7 @@ impl OAuth {
     /// println!("Successfully logged in: {:?} {:?}", client.user_id(), client.device_id());
     /// # anyhow::Ok(()) };
     /// ```
-    #[cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+    #[cfg(feature = "e2e-encryption")]
     pub fn login_with_qr_code<'a>(
         &'a self,
         data: &'a QrCodeData,
@@ -1154,7 +1154,7 @@ impl OAuth {
 
     /// Request codes from the authorization server for logging in with another
     /// device.
-    #[cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+    #[cfg(feature = "e2e-encryption")]
     async fn request_device_authorization(
         &self,
         server_metadata: &AuthorizationServerMetadata,
@@ -1182,7 +1182,7 @@ impl OAuth {
     }
 
     /// Exchange the device code against an access token.
-    #[cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+    #[cfg(feature = "e2e-encryption")]
     async fn exchange_device_code(
         &self,
         server_metadata: &AuthorizationServerMetadata,

crates/matrix-sdk/src/authentication/oauth/qrcode/login.rs

@@ -327,7 +327,7 @@ impl<'a> LoginWithQrCode<'a> {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(target_family = "wasm")))]
 mod test {
     use assert_matches2::{assert_let, assert_matches};
     use futures_util::{join, StreamExt};

crates/matrix-sdk/src/authentication/oauth/qrcode/rendezvous_channel.rs

@@ -284,7 +284,7 @@ impl RendezvousChannel {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(target_family = "wasm")))]
 mod test {
     use matrix_sdk_test::async_test;
     use serde_json::json;

crates/matrix-sdk/src/authentication/oauth/qrcode/secure_channel.rs

@@ -226,7 +226,7 @@ impl EstablishedSecureChannel {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(target_family = "wasm")))]
 pub(super) mod test {
     use std::sync::{
         atomic::{AtomicU8, Ordering},

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

@@ -16,9 +16,7 @@
 
 use std::{fmt::Debug, future::IntoFuture};
 
-use eyeball::SharedObservable;
-#[cfg(not(target_family = "wasm"))]
-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};
@@ -71,7 +69,6 @@ impl<R> SendRequest<R> {
 
     /// Get a subscriber to observe the progress of sending the request
     /// body.
-    #[cfg(not(target_family = "wasm"))]
     pub fn subscribe_to_send_progress(&self) -> Subscriber<TransmissionProgress> {
         self.send_progress.subscribe()
     }

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

@@ -19,9 +19,7 @@
 
 use std::{future::IntoFuture, io::Read};
 
-use eyeball::SharedObservable;
-#[cfg(not(target_family = "wasm"))]
-use eyeball::Subscriber;
+use eyeball::{SharedObservable, Subscriber};
 use matrix_sdk_common::boxed_into_future;
 use ruma::events::room::{EncryptedFile, EncryptedFileInit};
 
@@ -66,7 +64,6 @@ impl<'a, R: ?Sized> UploadEncryptedFile<'a, R> {
 
     /// Get a subscriber to observe the progress of sending the request
     /// body.
-    #[cfg(not(target_family = "wasm"))]
     pub fn subscribe_to_send_progress(&self) -> Subscriber<TransmissionProgress> {
         self.send_progress.subscribe()
     }

crates/matrix-sdk/src/encryption/identities/users.rs

@@ -108,7 +108,7 @@ impl UserIdentity {
         Self { inner: identity, client }
     }
 
-    #[cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+    #[cfg(feature = "e2e-encryption")]
     pub(crate) fn underlying_identity(&self) -> CryptoUserIdentity {
         self.inner.clone()
     }

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

@@ -723,7 +723,6 @@ impl Encryption {
         }
     }
 
-    #[cfg(not(target_family = "wasm"))]
     pub(crate) async fn import_secrets_bundle(
         &self,
         bundle: &matrix_sdk_base::crypto::types::SecretsBundle,
@@ -1691,7 +1690,6 @@ impl Encryption {
     /// **Warning**: Do not use this method if we're already calling
     /// [`Client::send_outgoing_request()`]. This method is intended for
     /// explicitly uploading the device keys before starting a sync.
-    #[cfg(not(target_family = "wasm"))]
     pub(crate) async fn ensure_device_keys_upload(&self) -> Result<()> {
         let olm = self.client.olm_machine().await;
         let olm = olm.as_ref().ok_or(Error::NoOlmMachine)?;

crates/matrix-sdk/src/room/identity_status_changes.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 //! Facility to track changes to the identity of members of rooms.
-#![cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+#![cfg(feature = "e2e-encryption")]
 
 use std::collections::BTreeMap;
 
@@ -193,7 +193,7 @@ fn wrap_room_member_events(
     (drop_guard, ReceiverStream::new(receiver))
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(target_family = "wasm")))]
 mod tests {
     use std::time::Duration;
 

crates/matrix-sdk/src/room/mod.rs

@@ -28,9 +28,9 @@ use eyeball::SharedObservable;
 use futures_core::Stream;
 use futures_util::{future::join_all, stream::FuturesUnordered};
 use http::StatusCode;
-#[cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+#[cfg(feature = "e2e-encryption")]
 pub use identity_status_changes::IdentityStatusChanges;
-#[cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+#[cfg(feature = "e2e-encryption")]
 use matrix_sdk_base::crypto::{IdentityStatusChange, RoomIdentityProvider, UserIdentity};
 #[cfg(feature = "e2e-encryption")]
 use matrix_sdk_base::{
@@ -47,7 +47,7 @@ use matrix_sdk_base::{
     ComposerDraft, EncryptionState, RoomInfoNotableUpdateReasons, RoomMemberships, SendOutsideWasm,
     StateChanges, StateStoreDataKey, StateStoreDataValue,
 };
-#[cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+#[cfg(feature = "e2e-encryption")]
 use matrix_sdk_common::BoxFuture;
 use matrix_sdk_common::{
     deserialized_responses::TimelineEvent,
@@ -583,7 +583,7 @@ impl Room {
     /// Note that if a user who is in pin violation leaves the room, a `Pinned`
     /// update is sent, to indicate that the warning should be removed, even
     /// though the user's identity is not necessarily pinned.
-    #[cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+    #[cfg(feature = "e2e-encryption")]
     pub async fn subscribe_to_identity_status_changes(
         &self,
     ) -> Result<impl Stream<Item = Vec<IdentityStatusChange>>> {
@@ -3709,7 +3709,7 @@ impl Room {
     }
 }
 
-#[cfg(all(feature = "e2e-encryption", not(target_family = "wasm")))]
+#[cfg(feature = "e2e-encryption")]
 impl RoomIdentityProvider for Room {
     fn is_member<'a>(&'a self, user_id: &'a UserId) -> BoxFuture<'a, bool> {
         Box::pin(async { self.get_member(user_id).await.unwrap_or(None).is_some() })