fixup: fix: don't use tokio timeout and sleep on wasm

matrix-org · Jan 22, 2025 · dbf2e65 · dbf2e65
1 parent 613f376
commit dbf2e65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/crates/matrix-sdk-common/src/sleep.rs b/crates/matrix-sdk-common/src/sleep.rs
@@ -20,11 +20,16 @@ use std::time::Duration;
 /// non-wasm32 targets.
 pub async fn sleep(duration: Duration) {
     #[cfg(not(target_arch = "wasm32"))]
-    #[allow(clippy::disallowed_methods)]
     tokio::time::sleep(duration).await;
 
     #[cfg(target_arch = "wasm32")]
-    gloo_timers::future::TimeoutFuture::new(duration.as_millis() as u32).await;
+    gloo_timers::future::TimeoutFuture::new(u32::try_from(duration.as_millis()).unwrap_or_else(
+        |_| {
+            tracing::error!("Sleep duration too long, sleeping for u32::MAX ms");
+            u32::MAX
+        },
+    ))
+    .await;
 }
 
 #[cfg(test)]

diff --git a/crates/matrix-sdk-common/src/timeout.rs b/crates/matrix-sdk-common/src/timeout.rs
@@ -44,7 +44,6 @@ where
     F: Future<Output = T>,
 {
     #[cfg(not(target_arch = "wasm32"))]
-    #[allow(clippy::disallowed_methods)]
     return tokio_timeout(duration, future).await.map_err(|_| ElapsedError(()));
 
     #[cfg(target_arch = "wasm32")]