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-build/Cargo.toml | 2 +- tests-build/tests/fail/macros_core_no_default.stderr | 2 +- tests-build/tests/macros.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests-build') diff --git a/tests-build/Cargo.toml b/tests-build/Cargo.toml index e76621b4..299af0cf 100644 --- a/tests-build/Cargo.toml +++ b/tests-build/Cargo.toml @@ -7,7 +7,7 @@ publish = false [features] full = ["tokio/full"] -rt-core = ["tokio/rt-core", "tokio/macros"] +rt = ["tokio/rt", "tokio/macros"] [dependencies] tokio = { path = "../tokio", optional = true } diff --git a/tests-build/tests/fail/macros_core_no_default.stderr b/tests-build/tests/fail/macros_core_no_default.stderr index a3ae32cd..6b3f8fa6 100644 --- a/tests-build/tests/fail/macros_core_no_default.stderr +++ b/tests-build/tests/fail/macros_core_no_default.stderr @@ -1,4 +1,4 @@ -error: The default runtime flavor is `multi_thread`, but the `rt-threaded` feature is disabled. +error: The default runtime flavor is `multi_thread`, but the `rt-multi-thread` feature is disabled. --> $DIR/macros_core_no_default.rs:3:1 | 3 | #[tokio::main] diff --git a/tests-build/tests/macros.rs b/tests-build/tests/macros.rs index a12a20ef..048e7f09 100644 --- a/tests-build/tests/macros.rs +++ b/tests-build/tests/macros.rs @@ -5,7 +5,7 @@ fn compile_fail_full() { #[cfg(feature = "full")] t.compile_fail("tests/fail/macros_invalid_input.rs"); - #[cfg(all(feature = "rt-core", not(feature = "full")))] + #[cfg(all(feature = "rt", not(feature = "full")))] t.compile_fail("tests/fail/macros_core_no_default.rs"); drop(t); -- cgit v1.2.3