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/blocking.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/blocking.rs')
-rw-r--r-- | tokio/src/blocking.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tokio/src/blocking.rs b/tokio/src/blocking.rs index d6ef5915..f88b1db1 100644 --- a/tokio/src/blocking.rs +++ b/tokio/src/blocking.rs @@ -1,9 +1,9 @@ -cfg_rt_core! { +cfg_rt! { pub(crate) use crate::runtime::spawn_blocking; pub(crate) use crate::task::JoinHandle; } -cfg_not_rt_core! { +cfg_not_rt! { use std::fmt; use std::future::Future; use std::pin::Pin; @@ -15,7 +15,7 @@ cfg_not_rt_core! { R: Send + 'static, { assert_send_sync::<JoinHandle<std::cell::Cell<()>>>(); - panic!("requires the `rt-core` Tokio feature flag") + panic!("requires the `rt` Tokio feature flag") } |