From c90681bd8e629b5fde988b9f5be7b915e5cf8ae5 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Tue, 13 Oct 2020 06:13:23 +0900 Subject: 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 --- tests-integration/Cargo.toml | 8 ++++---- tests-integration/tests/macros_main.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests-integration') diff --git a/tests-integration/Cargo.toml b/tests-integration/Cargo.toml index c6dd8450..105b9c61 100644 --- a/tests-integration/Cargo.toml +++ b/tests-integration/Cargo.toml @@ -8,16 +8,16 @@ publish = false [features] full = [ "macros", - "rt-core", - "rt-threaded", + "rt", + "rt-multi-thread", "tokio/full", "tokio-test" ] macros = ["tokio/macros"] sync = ["tokio/sync"] -rt-core = ["tokio/rt-core"] -rt-threaded = ["rt-core", "tokio/rt-threaded"] +rt = ["tokio/rt"] +rt-multi-thread = ["rt", "tokio/rt-multi-thread"] [dependencies] tokio = { path = "../tokio" } diff --git a/tests-integration/tests/macros_main.rs b/tests-integration/tests/macros_main.rs index 868adb0f..efe1ea9b 100644 --- a/tests-integration/tests/macros_main.rs +++ b/tests-integration/tests/macros_main.rs @@ -1,4 +1,4 @@ -#![cfg(all(feature = "macros", feature = "rt-core"))] +#![cfg(all(feature = "macros", feature = "rt"))] #[tokio::main] async fn basic_main() -> usize { -- cgit v1.2.3