Update sipper and relax Send requirements

iced-rs · Feb 9, 2025 · 7ba2e39 · 7ba2e39
1 parent c8981d0
commit 7ba2e39
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -172,7 +172,7 @@ raw-window-handle = "0.6"
 resvg = "0.42"
 rustc-hash = "2.0"
 sha2 = "0.10"
-sipper = "0.0.4"
+sipper = "0.0.5"
 smol = "1.0"
 smol_str = "0.2"
 softbuffer = "0.4"

diff --git a/runtime/src/task.rs b/runtime/src/task.rs
@@ -63,18 +63,15 @@ impl<T> Task<T> {
     /// progress with the first closure and the output with the second one.
     pub fn sip<S, Output, Progress>(
         sipper: S,
-        on_progress: impl Fn(Progress) -> T + Send + 'static,
-        on_output: impl FnOnce(Output) -> T + Send + 'static,
+        on_progress: impl Fn(Progress) -> T + MaybeSend + 'static,
+        on_output: impl FnOnce(Output) -> T + MaybeSend + 'static,
     ) -> Self
     where
-        S: Sipper<Output, Progress> + Send + 'static,
-        S::Future: Send + 'static,
-        Output: Send,
-        Progress: Send,
-        T: Send + 'static,
+        S: Sipper<Output, Progress> + MaybeSend + 'static,
+        T: MaybeSend + 'static,
     {
         Self::stream(stream(sipper::sipper(move |sender| async move {
-            on_output(sipper.map(on_progress).run(sender).await)
+            on_output(sipper.with(on_progress).run(sender).await)
         })))
     }