Merge #19

19: Use trybuild instead of compiletest r=taiki-e a=taiki-e

Refs: dtolnay/trybuild#13

Co-authored-by: Taiki Endo <te316e89@gmail.com>

Cargo.toml

@@ -27,6 +27,6 @@ futures-core-preview = { version = "0.3.0-alpha.18", default-features = false }
 pin-project = "0.4"
 
 [dev-dependencies]
-compiletest = { version = "=0.3.22", package = "compiletest_rs", features = ["stable", "tmp"] }
+trybuild = "1.0"
 futures-preview = "0.3.0-alpha.18"
 romio = "0.3.0-alpha.10"

azure-pipelines.yml

@@ -40,10 +40,7 @@ jobs:
       parameters:
         toolchain: nightly
     - script: |
-        cargo clean
-        cargo test -p futures-async-stream --all-features --test compiletest
-      env:
-        RUSTFLAGS: -Dwarnings --cfg compiletest
+        RUSTFLAGS='-Dwarnings --cfg compiletest' cargo test -p futures-async-stream --all-features --test compiletest
       displayName: compiletest
 
 - job: clippy
@@ -116,7 +113,5 @@ jobs:
       parameters:
         toolchain: nightly
     - script: |
-        cargo doc --no-deps --all --all-features
-      env:
-        RUSTDOCFLAGS: -Dwarnings
+        RUSTDOCFLAGS=-Dwarnings cargo doc --no-deps --all --all-features
       displayName: cargo doc

compiletest.sh

@@ -8,4 +8,5 @@
 # . ./compiletest.sh
 # ```
 
-rm -rf target/debug/deps/libfutures_async_stream* && RUSTFLAGS='--cfg compiletest' cargo +nightly test -p futures-async-stream --all-features --test compiletest
+TRYBUILD=overwrite RUSTFLAGS='--cfg compiletest' cargo +nightly test -p futures-async-stream --all-features --test compiletest
+# RUSTFLAGS='--cfg compiletest' cargo +nightly test -p futures-async-stream --all-features --test compiletest

tests/compiletest.rs

@@ -1,30 +1,8 @@
 #![cfg(compiletest)]
 #![warn(rust_2018_idioms)]
 
-use std::{env, path::PathBuf};
-
-fn run_mode(mode: &'static str) {
-    let mut config = compiletest::Config::default();
-    config.mode = mode.parse().expect("invalid mode");
-    let mut me = env::current_exe().unwrap();
-    me.pop();
-    config.target_rustcflags = Some(format!(
-        "--edition=2018 \
-         -Z unstable-options \
-         --extern futures_async_stream \
-         -L {}",
-        me.display()
-    ));
-    let src = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    config.src_base = src.join("tests").join(mode);
-
-    me.pop();
-    me.pop();
-    config.build_base = me.join("tests").join(mode);
-    compiletest::run_tests(&config);
-}
-
 #[test]
-fn compiletest() {
-    run_mode("ui");
+fn ui() {
+    let t = trybuild::TestCases::new();
+    t.compile_fail("tests/ui/*.rs");
 }

tests/ui/bad-item-type.stderr

@@ -125,7 +125,5 @@ note: the type is part of the generator because of this `yield`
 18 | #[async_stream(item = (i32, i32))]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 11 previous errors
-
 Some errors have detailed explanations: E0271, E0308, E0698.
 For more information about an error, try `rustc --explain E0271`.

tests/ui/forget-semicolon.stderr

@@ -9,6 +9,4 @@ error[E0308]: mismatched types
    = note: expected type `()`
               found type `std::option::Option<()>`
 
-error: aborting due to previous error
-
 For more information about this error, try `rustc --explain E0308`.

tests/ui/invalid-arguments.stderr

@@ -45,6 +45,3 @@ error: `boxed` and `boxed_local` cannot be used at the same time.
    |
 52 | #[async_stream(item = i32, boxed_local, boxed)] //~ ERROR `boxed` and `boxed_local` cannot be used at the same time.
    |                                         ^^^^^
-
-error: aborting due to 8 previous errors
-

tests/ui/invalid-function.stderr

@@ -27,6 +27,3 @@ error: async stream must return the unit type
    |
 17 | async fn output() -> i32 {} //~ ERROR async stream must return the unit type
    |                      ^^^
-
-error: aborting due to 5 previous errors
-

tests/ui/missing-item.stderr

@@ -3,6 +3,3 @@ error: unexpected end of input, expected `item`
   |
 7 | #[async_stream] //~ ERROR unexpected end of input, expected `item`
   | ^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-

tests/ui/move-captured-variable.stderr

@@ -16,6 +16,4 @@ error[E0507]: cannot move out of `a`, a captured variable in an `FnMut` closure
    | |__________move out of `a` occurs here
    |            in this macro invocation
 
-error: aborting due to previous error
-
 For more information about this error, try `rustc --explain E0507`.

tests/ui/nested.stderr

@@ -3,6 +3,3 @@ error[E0727]: `async` generators are not yet supported
    |
 19 |             yield i * i; //~ ERROR `async` generators are not yet supported [E0727]
    |             ^^^^^^^^^^^
-
-error: aborting due to previous error
-

tests/ui/question-mark-await-type-error.stderr

@@ -154,7 +154,5 @@ error[E0277]: the `?` operator can only be applied to values that implement `std
    = help: the trait `std::ops::Try` is not implemented for `()`
    = note: required by `std::ops::Try::into_result`
 
-error: aborting due to 14 previous errors
-
 Some errors have detailed explanations: E0277, E0698.
 For more information about an error, try `rustc --explain E0277`.

tests/ui/threads-sendsync.stderr

@@ -12,6 +12,4 @@ error[E0277]: `dyn futures_core::stream::Stream<Item = i32>` cannot be sent betw
    = note: required because it appears within the type `std::boxed::Box<dyn futures_core::stream::Stream<Item = i32>>`
    = note: required because it appears within the type `std::pin::Pin<std::boxed::Box<dyn futures_core::stream::Stream<Item = i32>>>`
 
-error: aborting due to previous error
-
 For more information about this error, try `rustc --explain E0277`.

tests/ui/type-error.stderr

@@ -7,6 +7,4 @@ error[E0308]: mismatched types
   = note: expected type `i32`
              found type `&'static str`
 
-error: aborting due to previous error
-
 For more information about this error, try `rustc --explain E0308`.

tests/ui/unresolved-type.stderr

@@ -3,17 +3,29 @@ error[E0412]: cannot find type `Left` in this scope
   |
 7 | #[async_stream(item = Left)] //~ ERROR cannot find type `Left` in this scope
   |                       ^^^^ not found in this scope
-help: there is an enum variant `core::fmt::Alignment::Left` and 4 others; try using the variant's enum
+help: there is an enum variant `core::fmt::Alignment::Left` and 9 others; try using the variant's enum
   |
 7 | #[async_stream(item = core::fmt::Alignment)] //~ ERROR cannot find type `Left` in this scope
   |                       ^^^^^^^^^^^^^^^^^^^^
 7 | #[async_stream(item = core::fmt::rt::v1::Alignment)] //~ ERROR cannot find type `Left` in this scope
   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 | #[async_stream(item = std::fmt::Alignment)] //~ ERROR cannot find type `Left` in this scope
-  |                       ^^^^^^^^^^^^^^^^^^^
-7 | #[async_stream(item = std::fmt::rt::v1::Alignment)] //~ ERROR cannot find type `Left` in this scope
-  |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 | #[async_stream(item = futures::core_reexport::fmt::Alignment)] //~ ERROR cannot find type `Left` in this scope
+  |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+7 | #[async_stream(item = futures::core_reexport::fmt::rt::v1::Alignment)] //~ ERROR cannot find type `Left` in this scope
+  |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+and 5 other candidates
 
-error: aborting due to previous error
+error[E0698]: type inside generator must be known in this context
+ --> $DIR/unresolved-type.rs:7:1
+  |
+7 | #[async_stream(item = Left)] //~ ERROR cannot find type `Left` in this scope
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type for `T`
+  |
+note: the type is part of the generator because of this `yield`
+ --> $DIR/unresolved-type.rs:7:1
+  |
+7 | #[async_stream(item = Left)] //~ ERROR cannot find type `Left` in this scope
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-For more information about this error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0412, E0698.
+For more information about an error, try `rustc --explain E0412`.