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-util | |
| 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-util')
| -rw-r--r-- | tokio-util/Cargo.toml | 2 | ||||
| -rw-r--r-- | tokio-util/src/cfg.rs | 6 | ||||
| -rw-r--r-- | tokio-util/src/lib.rs | 2 | ||||
| -rw-r--r-- | tokio-util/tests/context.rs | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tokio-util/Cargo.toml b/tokio-util/Cargo.toml index f6007ce2..7a235b58 100644 --- a/tokio-util/Cargo.toml +++ b/tokio-util/Cargo.toml @@ -31,7 +31,7 @@ compat = ["futures-io",] codec = ["tokio/stream"] time = ["tokio/time","slab"] io = [] -rt-core = ["tokio/rt-core"] +rt = ["tokio/rt"] [dependencies] tokio = { version = "0.3.0", path = "../tokio" } diff --git a/tokio-util/src/cfg.rs b/tokio-util/src/cfg.rs index a848223f..ee423d43 100644 --- a/tokio-util/src/cfg.rs +++ b/tokio-util/src/cfg.rs @@ -40,11 +40,11 @@ macro_rules! cfg_io { } } -macro_rules! cfg_rt_core { +macro_rules! cfg_rt { ($($item:item)*) => { $( - #[cfg(feature = "rt-core")] - #[cfg_attr(docsrs, doc(cfg(feature = "rt-core")))] + #[cfg(feature = "rt")] + #[cfg_attr(docsrs, doc(cfg(feature = "rt")))] $item )* } diff --git a/tokio-util/src/lib.rs b/tokio-util/src/lib.rs index 55fd67eb..10b828ef 100644 --- a/tokio-util/src/lib.rs +++ b/tokio-util/src/lib.rs @@ -47,7 +47,7 @@ cfg_io! { pub mod io; } -cfg_rt_core! { +cfg_rt! { pub mod context; } diff --git a/tokio-util/tests/context.rs b/tokio-util/tests/context.rs index 852dcd0b..7510f36f 100644 --- a/tokio-util/tests/context.rs +++ b/tokio-util/tests/context.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "rt-core")] +#![cfg(feature = "rt")] #![warn(rust_2018_idioms)] use tokio::runtime::Builder; |