✨ Add task::CloseAndWait::close_and_wait()

Author: czy-29

Cargo.toml

@@ -31,9 +31,10 @@ ron = "0.8.1"
 serde = { version = "1.0.216", features = ["derive"] }
 thiserror = "2.0.6"
 tokio = { version = "1.42.0", features = ["rt"] }
+tokio-util = { version = "0.7.13", features = ["rt"] }
 
 [dev-dependencies]
-tokio = { version = "1.42.0", features = ["macros"] }
+tokio = { version = "1.42.0", features = ["macros", "time"] }
 
 [build-dependencies]
 version_check = "0.9.5"

README-CN.md

@@ -32,6 +32,7 @@
 部分条目如下：
 - [`AnyRes`](https://docs.rs/est/latest/est/result/type.AnyRes.html)
 - [`collections::MapExt::replace_key()`](https://docs.rs/est/latest/est/collections/trait.MapExt.html#tymethod.replace_key)
+- [`task::CloseAndWait::close_and_wait()`](https://docs.rs/est/latest/est/task/trait.CloseAndWait.html#tymethod.close_and_wait)
 - [`task::TaskId`](https://docs.rs/est/latest/est/task/struct.TaskId.html)
 - [`thread::ThreadId`](https://docs.rs/est/latest/est/thread/struct.ThreadId.html)
 

README.md

@@ -32,6 +32,7 @@ Latest version: [v0.5.0](https://github.com/opensound-org/est/releases/tag/v0.5.
 Some of the items are as follows:
 - [`AnyRes`](https://docs.rs/est/latest/est/result/type.AnyRes.html)
 - [`collections::MapExt::replace_key()`](https://docs.rs/est/latest/est/collections/trait.MapExt.html#tymethod.replace_key)
+- [`task::CloseAndWait::close_and_wait()`](https://docs.rs/est/latest/est/task/trait.CloseAndWait.html#tymethod.close_and_wait)
 - [`task::TaskId`](https://docs.rs/est/latest/est/task/struct.TaskId.html)
 - [`thread::ThreadId`](https://docs.rs/est/latest/est/thread/struct.ThreadId.html)
 

src/task.rs

@@ -1,6 +1,7 @@
 use derive_more::Display;
 use serde::{Deserialize, Serialize};
 use std::num::NonZeroU64;
+use tokio_util::task::{task_tracker::TaskTrackerWaitFuture, TaskTracker};
 
 /// A [`TaskId`](https://docs.rs/tokio/latest/tokio/task/struct.Id.html) that can be `serde`.
 #[derive(Debug, Display, Serialize, Deserialize, Copy, Clone, Eq, PartialEq, Hash)]
@@ -13,6 +14,20 @@ impl From<tokio::task::Id> for TaskId {
     }
 }
 
+/// Execute [`close`](https://docs.rs/tokio-util/latest/tokio_util/task/task_tracker/struct.TaskTracker.html#method.close)
+/// and [`wait`](https://docs.rs/tokio-util/latest/tokio_util/task/task_tracker/struct.TaskTracker.html#method.wait)
+/// for [`TaskTracker`](https://docs.rs/tokio-util/latest/tokio_util/task/task_tracker/struct.TaskTracker.html) at once.
+pub trait CloseAndWait {
+    fn close_and_wait(&self) -> TaskTrackerWaitFuture;
+}
+
+impl CloseAndWait for TaskTracker {
+    fn close_and_wait(&self) -> TaskTrackerWaitFuture {
+        self.close();
+        self.wait()
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -22,4 +37,38 @@ mod tests {
         let id = tokio::spawn(async { tokio::task::id() }).await.unwrap();
         assert_eq!(id.to_string(), TaskId::from(id).to_string());
     }
+
+    fn tracker_spawn() -> TaskTracker {
+        let tracker = TaskTracker::new();
+
+        for i in 0..3 {
+            tracker.spawn(async move { i });
+        }
+
+        tracker
+    }
+
+    #[tokio::test]
+    async fn close_and_wait() {
+        use std::time::Duration;
+        use tokio::time::timeout;
+
+        let tracker = tracker_spawn();
+        assert!(timeout(Duration::from_secs_f64(1.5), tracker.wait())
+            .await
+            .is_err());
+
+        let tracker = tracker_spawn();
+        tracker.close();
+        assert!(timeout(Duration::from_secs_f64(1.5), tracker.wait())
+            .await
+            .is_ok());
+
+        let tracker = tracker_spawn();
+        assert!(
+            timeout(Duration::from_secs_f64(1.5), tracker.close_and_wait())
+                .await
+                .is_ok()
+        );
+    }
 }