diff --git a/tokio-util/src/task/join_map.rs b/tokio-util/src/task/join_map.rs index 13e27bb670b..c3ab3958a97 100644 --- a/tokio-util/src/task/join_map.rs +++ b/tokio-util/src/task/join_map.rs @@ -29,10 +29,6 @@ use tokio::task::{AbortHandle, Id, JoinError, JoinSet, LocalSet}; /// /// When the `JoinMap` is dropped, all tasks in the `JoinMap` are immediately aborted. /// -/// **Note**: This type depends on Tokio's [unstable API][unstable]. See [the -/// documentation on unstable features][unstable] for details on how to enable -/// Tokio's unstable features. -/// /// # Examples /// /// Spawn multiple tasks and wait for them: @@ -96,11 +92,10 @@ use tokio::task::{AbortHandle, Id, JoinError, JoinSet, LocalSet}; /// ``` /// /// [`JoinSet`]: tokio::task::JoinSet -/// [unstable]: tokio#unstable-features /// [abort]: fn@Self::abort /// [abort_matching]: fn@Self::abort_matching /// [contains]: fn@Self::contains_key -#[cfg_attr(docsrs, doc(cfg(all(feature = "rt", tokio_unstable))))] +#[cfg_attr(docsrs, doc(cfg(feature = "rt")))] pub struct JoinMap { /// A map of the [`AbortHandle`]s of the tasks spawned on this `JoinMap`, /// indexed by their keys and task IDs. diff --git a/tokio-util/src/task/mod.rs b/tokio-util/src/task/mod.rs index 6d0c379fe20..16b415b5da1 100644 --- a/tokio-util/src/task/mod.rs +++ b/tokio-util/src/task/mod.rs @@ -5,8 +5,7 @@ mod join_map; mod spawn_pinned; pub use spawn_pinned::LocalPoolHandle; -#[cfg(tokio_unstable)] -#[cfg_attr(docsrs, doc(cfg(all(tokio_unstable, feature = "rt"))))] +#[cfg_attr(docsrs, doc(cfg(feature = "rt")))] pub use join_map::{JoinMap, JoinMapKeys}; pub mod task_tracker; diff --git a/tokio-util/tests/task_join_map.rs b/tokio-util/tests/task_join_map.rs index 8757f8b5c6e..e83036dec33 100644 --- a/tokio-util/tests/task_join_map.rs +++ b/tokio-util/tests/task_join_map.rs @@ -1,6 +1,6 @@ #![allow(unknown_lints, unexpected_cfgs)] #![warn(rust_2018_idioms)] -#![cfg(all(feature = "rt", tokio_unstable))] +#![cfg(feature = "rt")] use tokio::sync::oneshot; use tokio::time::Duration;