Update ui tests

rust-lang · May 4, 2019 · d94fd0d · d94fd0d
1 parent bd88939
commit d94fd0d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 138 deletions.
diff --git a/futures/testcrate/ui/bad-return-type.stderr b/futures/testcrate/ui/bad-return-type.stderr
@@ -11,41 +11,17 @@ error[E0308]: mismatched types
               found type `{integer}`
 
 error[E0698]: type inside generator must be known in this context
- --> $DIR/bad-return-type.rs:7:9
+ --> $DIR/bad-return-type.rs:5:1
   |
-7 |     let val = Some(42);
-  |         ^^^
+5 | #[async_stream]
+  | ^^^^^^^^^^^^^^^ cannot infer type for `{integer}`
   |
 note: the type is part of the generator because of this `yield`
  --> $DIR/bad-return-type.rs:5:1
   |
 5 | #[async_stream]
   | ^^^^^^^^^^^^^^^
 
-error[E0698]: type inside generator must be known in this context
-  --> $DIR/bad-return-type.rs:12:9
-   |
-12 |     let val = val.unwrap();
-   |         ^^^
-   |
-note: the type is part of the generator because of this `yield`
-  --> $DIR/bad-return-type.rs:5:1
-   |
-5  | #[async_stream]
-   | ^^^^^^^^^^^^^^^
-
-error[E0698]: type inside generator must be known in this context
-  --> $DIR/bad-return-type.rs:13:11
-   |
-13 |     yield val;
-   |           ^^^
-   |
-note: the type is part of the generator because of this `yield`
-  --> $DIR/bad-return-type.rs:5:1
-   |
-5  | #[async_stream]
-   | ^^^^^^^^^^^^^^^
-
 error[E0308]: mismatched types
   --> $DIR/bad-return-type.rs:21:11
    |
@@ -69,63 +45,15 @@ error[E0698]: type inside generator must be known in this context
   --> $DIR/bad-return-type.rs:16:1
    |
 16 | #[async_stream]
-   | ^^^^^^^^^^^^^^^
-   |
-note: the type is part of the generator because of this `yield`
-  --> $DIR/bad-return-type.rs:16:1
-   |
-16 | #[async_stream]
-   | ^^^^^^^^^^^^^^^
-
-error[E0698]: type inside generator must be known in this context
-  --> $DIR/bad-return-type.rs:19:15
-   |
-19 |         yield 3;
-   |               ^
-   |
-note: the type is part of the generator because of this `yield`
-  --> $DIR/bad-return-type.rs:16:1
-   |
-16 | #[async_stream]
-   | ^^^^^^^^^^^^^^^
-
-error[E0698]: type inside generator must be known in this context
-  --> $DIR/bad-return-type.rs:21:12
-   |
-21 |     yield (1, 2)
-   |            ^
-   |
-note: the type is part of the generator because of this `yield`
-  --> $DIR/bad-return-type.rs:16:1
-   |
-16 | #[async_stream]
-   | ^^^^^^^^^^^^^^^
-
-error[E0698]: type inside generator must be known in this context
-  --> $DIR/bad-return-type.rs:21:15
-   |
-21 |     yield (1, 2)
-   |               ^
-   |
-note: the type is part of the generator because of this `yield`
-  --> $DIR/bad-return-type.rs:16:1
-   |
-16 | #[async_stream]
-   | ^^^^^^^^^^^^^^^
-
-error[E0698]: type inside generator must be known in this context
-  --> $DIR/bad-return-type.rs:21:11
-   |
-21 |     yield (1, 2)
-   |           ^^^^^^
+   | ^^^^^^^^^^^^^^^ cannot infer type for `{integer}`
    |
 note: the type is part of the generator because of this `yield`
   --> $DIR/bad-return-type.rs:16:1
    |
 16 | #[async_stream]
    | ^^^^^^^^^^^^^^^
 
-error: aborting due to 11 previous errors
+error: aborting due to 5 previous errors
 
-Some errors have detailed explanations: E0271, E0308.
+Some errors have detailed explanations: E0271, E0308, E0698.
 For more information about an error, try `rustc --explain E0271`.
diff --git a/futures/testcrate/ui/nested.stderr b/futures/testcrate/ui/nested.stderr
@@ -8,58 +8,10 @@ error[E0308]: mismatched types
               found type `{integer}`
 
 error[E0698]: type inside generator must be known in this context
- --> $DIR/nested.rs:5:1
-  |
-5 | #[async_stream]
-  | ^^^^^^^^^^^^^^^
-  |
-note: the type is part of the generator because of this `yield`
- --> $DIR/nested.rs:10:13
-  |
-10|             yield i * i;
-  |             ^^^^^^^^^^^
-
-error[E0698]: type inside generator must be known in this context
- --> $DIR/nested.rs:5:1
-  |
-5 | #[async_stream]
-  | ^^^^^^^^^^^^^^^
-  |
-note: the type is part of the generator because of this `yield`
- --> $DIR/nested.rs:5:1
-  |
-5 | #[async_stream]
-  | ^^^^^^^^^^^^^^^
-
-error[E0698]: type inside generator must be known in this context
- --> $DIR/nested.rs:9:13
-  |
-9 |         for i in stream::iter(vec![1, 2]) {
-  |             ^
-  |
-note: the type is part of the generator because of this `yield`
- --> $DIR/nested.rs:10:13
-  |
-10|             yield i * i;
-  |             ^^^^^^^^^^^
-
-error[E0698]: type inside generator must be known in this context
-  --> $DIR/nested.rs:10:19
-   |
-10 |             yield i * i;
-   |                   ^
-   |
-note: the type is part of the generator because of this `yield`
   --> $DIR/nested.rs:10:13
    |
 10 |             yield i * i;
-   |             ^^^^^^^^^^^
-
-error[E0698]: type inside generator must be known in this context
-  --> $DIR/nested.rs:10:23
-   |
-10 |             yield i * i;
-   |                       ^
+   |             ^^^^^^^^^^^ cannot infer type for `{integer}`
    |
 note: the type is part of the generator because of this `yield`
   --> $DIR/nested.rs:10:13
@@ -68,17 +20,18 @@ note: the type is part of the generator because of this `yield`
    |             ^^^^^^^^^^^
 
 error[E0698]: type inside generator must be known in this context
-  --> $DIR/nested.rs:10:19
-   |
-10 |             yield i * i;
-   |                   ^^^^^
-   |
+ --> $DIR/nested.rs:5:1
+  |
+5 | #[async_stream]
+  | ^^^^^^^^^^^^^^^ cannot infer type for `{integer}`
+  |
 note: the type is part of the generator because of this `yield`
-  --> $DIR/nested.rs:10:13
-   |
-10 |             yield i * i;
-   |             ^^^^^^^^^^^
+ --> $DIR/nested.rs:5:1
+  |
+5 | #[async_stream]
+  | ^^^^^^^^^^^^^^^
 
-error: aborting due to 7 previous errors
+error: aborting due to 3 previous errors
 
-For more information about this error, try `rustc --explain E0308`.
+Some errors have detailed explanations: E0308, E0698.
+For more information about an error, try `rustc --explain E0308`.