Updating the tokio dependencies to support an older version

ractor/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ractor"
-version = "0.13.0"
+version = "0.13.1"
 authors = ["Sean Lawlor", "Evan Au", "Dillon George"]
 description = "A actor framework for Rust"
 documentation = "https://docs.rs/ractor"
@@ -36,7 +36,7 @@ strum = { version = "0.26", features = ["derive"] }
 # Tracing feature requires --cfg=tokio_unstable
 async-std = { version = "1", features = ["attributes"], optional = true }
 async-trait = { version = "0.1", optional = true }
-tokio = { version = "1.40", features = ["sync"] }
+tokio = { version = "1.30", features = ["sync"] }
 tracing = { version = "0.1", features = ["attributes"] }
 
 ## Blanket Serde
@@ -50,7 +50,7 @@ function_name = "0.3"
 paste = "1"
 serial_test = "3.0.0"
 rand = "0.8"
-tokio = { version = "1", features = ["rt", "time", "sync", "macros", "rt-multi-thread", "tracing"] }
+tokio = { version = "1.30", features = ["rt", "time", "sync", "macros", "rt-multi-thread", "tracing"] }
 tracing-glog = "0.4"
 tracing-subscriber = { version = "0.3", features = ["env-filter"]}
 tracing-test = "0.2"

ractor/src/actor/supervision.rs

@@ -89,7 +89,14 @@ impl SupervisionTree {
             let ltimeout = timeout;
             js.spawn(async move { cell.stop_and_wait(lreason, ltimeout).await });
         }
-        _ = js.join_all().await;
+        // drain the tasks
+        while let Some(res) = js.join_next().await {
+            match res {
+                Err(err) if err.is_panic() => std::panic::resume_unwind(err.into_panic()),
+                Err(err) => panic!("{err}"),
+                _ => {}
+            }
+        }
     }
 
     /// Drain all the linked children, but does NOT unlink them
@@ -103,7 +110,14 @@ impl SupervisionTree {
             let ltimeout = timeout;
             js.spawn(async move { cell.drain_and_wait(ltimeout).await });
         }
-        _ = js.join_all().await;
+        // drain the tasks
+        while let Some(res) = js.join_next().await {
+            match res {
+                Err(err) if err.is_panic() => std::panic::resume_unwind(err.into_panic()),
+                Err(err) => panic!("{err}"),
+                _ => {}
+            }
+        }
     }
 
     /// Determine if the specified actor is a parent of this actor

ractor_cluster/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ractor_cluster"
-version = "0.13.0"
+version = "0.13.1"
 authors = ["Sean Lawlor", "Evan Au", "Dillon George"]
 description = "Distributed cluster environment of Ractor actors"
 documentation = "https://docs.rs/ractor"
@@ -27,9 +27,9 @@ ractor = { version = "0.13.0", features = ["cluster"], path = "../ractor" }
 ractor_cluster_derive = { version = "0.13.0", path = "../ractor_cluster_derive" }
 rand = "0.8"
 sha2 = "0.10"
-tokio = { version = "1", features = ["rt", "time", "sync", "macros", "net", "io-util", "tracing"]}
+tokio = { version = "1.30", features = ["rt", "time", "sync", "macros", "net", "io-util", "tracing"]}
 tokio-rustls = { version = "0.26" }
 tracing = "0.1"
 
 [dev-dependencies]
-tokio = { version = "1", features = ["rt", "time", "sync", "macros", "net", "io-util", "rt-multi-thread"] }
+tokio = { version = "1.30", features = ["rt", "time", "sync", "macros", "net", "io-util", "rt-multi-thread"] }

ractor_cluster_derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ractor_cluster_derive"
-version = "0.13.0"
+version = "0.13.1"
 authors = ["Sean Lawlor <[email protected]>"]
 description = "Derives for ractor_cluster"
 license = "MIT"