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/future | |
| 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/future')
| -rw-r--r-- | tokio/src/future/block_on.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tokio/src/future/block_on.rs b/tokio/src/future/block_on.rs index 9fc7abc6..91f9cc00 100644 --- a/tokio/src/future/block_on.rs +++ b/tokio/src/future/block_on.rs @@ -1,13 +1,13 @@ use std::future::Future; -cfg_rt_core! { +cfg_rt! { pub(crate) fn block_on<F: Future>(f: F) -> F::Output { let mut e = crate::runtime::enter::enter(false); e.block_on(f).unwrap() } } -cfg_not_rt_core! { +cfg_not_rt! { pub(crate) fn block_on<F: Future>(f: F) -> F::Output { let mut park = crate::park::thread::CachedParkThread::new(); park.block_on(f).unwrap() |