Skip to content

task: add #[track_caller] to JoinSet/JoinMap #4697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hawkw merged 2 commits into from
May 16, 2022
Merged

task: add #[track_caller] to JoinSet/JoinMap #4697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d2ee3d
task: add `#[track_caller]` to `JoinSet` spawn methods
hawkw May 16, 2022
97627f5
util: add missing `#[track_caller]`s to `JoinMap`
hawkw May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tokio-util/src/task/join_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ where
/// This method panics if called outside of a Tokio runtime.
///
/// [`join_one`]: Self::join_one
#[track_caller]
pub fn spawn<F>(&mut self, key: K, task: F)
where
F: Future<Output = V>,
Expand All @@ -304,6 +305,7 @@ where
/// *not* return a cancelled [`JoinError`] for that task.
///
/// [`join_one`]: Self::join_one
#[track_caller]
pub fn spawn_on<F>(&mut self, key: K, task: F, handle: &Handle)
where
F: Future<Output = V>,
Expand All @@ -328,6 +330,7 @@ where
///
/// [`LocalSet`]: tokio::task::LocalSet
/// [`join_one`]: Self::join_one
#[track_caller]
pub fn spawn_local<F>(&mut self, key: K, task: F)
where
F: Future<Output = V>,
Expand All @@ -347,6 +350,7 @@ where
///
/// [`LocalSet`]: tokio::task::LocalSet
/// [`join_one`]: Self::join_one
#[track_caller]
pub fn spawn_local_on<F>(&mut self, key: K, task: F, local_set: &LocalSet)
where
F: Future<Output = V>,
Expand Down
4 changes: 4 additions & 0 deletions tokio/src/task/join_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ impl<T: 'static> JoinSet<T> {
/// This method panics if called outside of a Tokio runtime.
///
/// [`AbortHandle`]: crate::task::AbortHandle
#[track_caller]
pub fn spawn<F>(&mut self, task: F) -> AbortHandle
where
F: Future<Output = T>,
Expand All @@ -95,6 +96,7 @@ impl<T: 'static> JoinSet<T> {
/// cancel the task.
///
/// [`AbortHandle`]: crate::task::AbortHandle
#[track_caller]
pub fn spawn_on<F>(&mut self, task: F, handle: &Handle) -> AbortHandle
where
F: Future<Output = T>,
Expand All @@ -114,6 +116,7 @@ impl<T: 'static> JoinSet<T> {
///
/// [`LocalSet`]: crate::task::LocalSet
/// [`AbortHandle`]: crate::task::AbortHandle
#[track_caller]
pub fn spawn_local<F>(&mut self, task: F) -> AbortHandle
where
F: Future<Output = T>,
Expand All @@ -128,6 +131,7 @@ impl<T: 'static> JoinSet<T> {
///
/// [`LocalSet`]: crate::task::LocalSet
/// [`AbortHandle`]: crate::task::AbortHandle
#[track_caller]
pub fn spawn_local_on<F>(&mut self, task: F, local_set: &LocalSet) -> AbortHandle
where
F: Future<Output = T>,
Expand Down