diff options
| author | Taiki Endo <te316e89@gmail.com> | 2020-10-13 06:13:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 14:13:23 -0700 |
| commit | c90681bd8e629b5fde988b9f5be7b915e5cf8ae5 (patch) | |
| tree | e70838b9437123dc986ebcfeb8fc0c44ca3fe667 /tokio/src/task/local.rs | |
| parent | 24d0a0cfa8916eaef17f40f044d978aa3904d654 (diff) | |
rt: simplify rt-* features (#2949)
tokio:
merge rt-core and rt-util as rt
rename rt-threaded to rt-multi-thread
tokio-util:
rename rt-core to rt
Closes #2942
Diffstat (limited to 'tokio/src/task/local.rs')
| -rw-r--r-- | tokio/src/task/local.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tokio/src/task/local.rs b/tokio/src/task/local.rs index e19cbe63..5896126c 100644 --- a/tokio/src/task/local.rs +++ b/tokio/src/task/local.rs @@ -14,7 +14,7 @@ use std::task::Poll; use pin_project_lite::pin_project; -cfg_rt_util! { +cfg_rt! { /// A set of tasks which are executed on the same thread. /// /// In some cases, it is necessary to run one or more futures that do not @@ -158,7 +158,7 @@ pin_project! { scoped_thread_local!(static CURRENT: Context); -cfg_rt_util! { +cfg_rt! { /// Spawns a `!Send` future on the local task set. /// /// The spawned future will be run on the same thread that called `spawn_local.` @@ -346,8 +346,8 @@ impl LocalSet { /// [`Runtime::block_on`]: method@crate::runtime::Runtime::block_on /// [in-place blocking]: fn@crate::task::block_in_place /// [`spawn_blocking`]: fn@crate::task::spawn_blocking - #[cfg(feature = "rt-core")] - #[cfg_attr(docsrs, doc(cfg(feature = "rt-core")))] + #[cfg(feature = "rt")] + #[cfg_attr(docsrs, doc(cfg(feature = "rt")))] pub fn block_on<F>(&self, rt: &crate::runtime::Runtime, future: F) -> F::Output where F: Future, |