summaryrefslogtreecommitdiffstats
path: root/tests-build
diff options
context:
space:
mode:
authorLucio Franco <luciofranco14@gmail.com>2020-10-12 13:44:54 -0400
committerGitHub <noreply@github.com>2020-10-12 13:44:54 -0400
commit8880222036f37c6204c8466f25e828447f16dacb (patch)
treefd623afc20f73bbce65746a3d1b1b2731ecf30a5 /tests-build
parent0893841f31542b2b04c5050a8a4a3c45cf867e55 (diff)
rt: Remove `threaded_scheduler()` and `basic_scheduler()` (#2876)
Co-authored-by: Alice Ryhl <alice@ryhl.io> Co-authored-by: Carl Lerche <me@carllerche.com>
Diffstat (limited to 'tests-build')
-rw-r--r--tests-build/Cargo.toml1
-rw-r--r--tests-build/tests/fail/macros_core_no_default.rs6
-rw-r--r--tests-build/tests/fail/macros_core_no_default.stderr7
-rw-r--r--tests-build/tests/fail/macros_invalid_input.stderr4
-rw-r--r--tests-build/tests/macros.rs5
5 files changed, 20 insertions, 3 deletions
diff --git a/tests-build/Cargo.toml b/tests-build/Cargo.toml
index 68231d71..e76621b4 100644
--- a/tests-build/Cargo.toml
+++ b/tests-build/Cargo.toml
@@ -7,6 +7,7 @@ publish = false
[features]
full = ["tokio/full"]
+rt-core = ["tokio/rt-core", "tokio/macros"]
[dependencies]
tokio = { path = "../tokio", optional = true }
diff --git a/tests-build/tests/fail/macros_core_no_default.rs b/tests-build/tests/fail/macros_core_no_default.rs
new file mode 100644
index 00000000..23f8847d
--- /dev/null
+++ b/tests-build/tests/fail/macros_core_no_default.rs
@@ -0,0 +1,6 @@
+use tests_build::tokio;
+
+#[tokio::main]
+async fn my_fn() {}
+
+fn main() {}
diff --git a/tests-build/tests/fail/macros_core_no_default.stderr b/tests-build/tests/fail/macros_core_no_default.stderr
new file mode 100644
index 00000000..a3ae32cd
--- /dev/null
+++ b/tests-build/tests/fail/macros_core_no_default.stderr
@@ -0,0 +1,7 @@
+error: The default runtime flavor is `multi_thread`, but the `rt-threaded` feature is disabled.
+ --> $DIR/macros_core_no_default.rs:3:1
+ |
+3 | #[tokio::main]
+ | ^^^^^^^^^^^^^^
+ |
+ = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/tests-build/tests/fail/macros_invalid_input.stderr b/tests-build/tests/fail/macros_invalid_input.stderr
index 96fdcb17..4c68bd93 100644
--- a/tests-build/tests/fail/macros_invalid_input.stderr
+++ b/tests-build/tests/fail/macros_invalid_input.stderr
@@ -4,7 +4,7 @@ error: the async keyword is missing from the function declaration
4 | fn main_is_not_async() {}
| ^^
-error: Unknown attribute foo is specified; expected `basic_scheduler` or `threaded_scheduler`
+error: Unknown attribute foo is specified; expected one of: `flavor`, `worker_threads`
--> $DIR/macros_invalid_input.rs:6:15
|
6 | #[tokio::main(foo)]
@@ -28,7 +28,7 @@ error: the test function cannot accept arguments
16 | async fn test_fn_has_args(_x: u8) {}
| ^^^^^^
-error: Unknown attribute foo is specified; expected `basic_scheduler` or `threaded_scheduler`
+error: Unknown attribute foo is specified; expected one of: `flavor`, `worker_threads`
--> $DIR/macros_invalid_input.rs:18:15
|
18 | #[tokio::test(foo)]
diff --git a/tests-build/tests/macros.rs b/tests-build/tests/macros.rs
index 170db227..a12a20ef 100644
--- a/tests-build/tests/macros.rs
+++ b/tests-build/tests/macros.rs
@@ -1,9 +1,12 @@
#[test]
-fn compile_fail() {
+fn compile_fail_full() {
let t = trybuild::TestCases::new();
#[cfg(feature = "full")]
t.compile_fail("tests/fail/macros_invalid_input.rs");
+ #[cfg(all(feature = "rt-core", not(feature = "full")))]
+ t.compile_fail("tests/fail/macros_core_no_default.rs");
+
drop(t);
}