Skip to content

Commit cb8a508

Browse files
taiki-etaiki-e
authored
Fix CI failure (#67)
1 parent 8bf33a6 commit cb8a508

File tree

8 files changed

+36
-75
lines changed

8 files changed

+36
-75
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
push:
88
branches:
99
- master
10+
schedule:
11+
- cron: '0 2 * * *'
1012

1113
env:
1214
RUSTFLAGS: -Dwarnings
@@ -23,6 +25,7 @@ jobs:
2325
- uses: actions/checkout@v1
2426
- name: Install Rust
2527
run: rustup update stable
28+
- run: rustup component add rust-src
2629
- run: cargo test --all-features
2730

2831
minrust:

‎async-stream-impl/src/lib.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ pub fn stream_inner(input: TokenStream) -> TokenStream {
212212

213213
let mut scrub = Scrub::new(false, &crate_path);
214214

215-
for mut stmt in &mut stmts {
216-
scrub.visit_stmt_mut(&mut stmt);
215+
for stmt in &mut stmts {
216+
scrub.visit_stmt_mut(stmt);
217217
}
218218

219219
let dummy_yield = if scrub.has_yielded {
@@ -246,8 +246,8 @@ pub fn try_stream_inner(input: TokenStream) -> TokenStream {
246246

247247
let mut scrub = Scrub::new(true, &crate_path);
248248

249-
for mut stmt in &mut stmts {
250-
scrub.visit_stmt_mut(&mut stmt);
249+
for stmt in &mut stmts {
250+
scrub.visit_stmt_mut(stmt);
251251
}
252252

253253
let dummy_yield = if scrub.has_yielded {

‎async-stream/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ futures-core = "0.3"
2121

2222
[dev-dependencies]
2323
futures-util = "0.3"
24+
rustversion = "1"
2425
tokio = { version = "1", features = ["full"] }
2526
tokio-test = "0.4"
2627
trybuild = "1"

‎async-stream/tests/stream.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ async fn noop_stream() {
1111
let s = stream! {};
1212
pin_mut!(s);
1313

14-
while let Some(_) = s.next().await {
14+
while s.next().await.is_some() {
1515
unreachable!();
1616
}
1717
}
@@ -28,7 +28,7 @@ async fn empty_stream() {
2828
};
2929
pin_mut!(s);
3030

31-
while let Some(_) = s.next().await {
31+
while s.next().await.is_some() {
3232
unreachable!();
3333
}
3434
}
@@ -229,6 +229,7 @@ fn inner_try_stream() {
229229
};
230230
}
231231

232+
#[rustversion::attr(not(stable), ignore)]
232233
#[test]
233234
fn test() {
234235
let t = trybuild::TestCases::new();

‎async-stream/tests/ui/yield_bad_expr_in_macro.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: expected expression
2-
--> $DIR/yield_bad_expr_in_macro.rs:8:33
2+
--> tests/ui/yield_bad_expr_in_macro.rs:8:33
33
|
44
8 | _ = work() => yield fn f() {},
55
| ^^

‎async-stream/tests/ui/yield_in_async.stderr‎

Lines changed: 10 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
error[E0658]: yield syntax is experimental
2-
--> $DIR/yield_in_async.rs:6:13
2+
--> tests/ui/yield_in_async.rs:6:13
33
|
44
6 | yield 123;
55
| ^^^^^^^^^
66
|
77
= note: see issue #43122 <https://github.com/rust-lang/rust/issues/43122> for more information
88

99
error[E0727]: `async` generators are not yet supported
10-
--> $DIR/yield_in_async.rs:6:13
10+
--> tests/ui/yield_in_async.rs:6:13
1111
|
1212
6 | yield 123;
1313
| ^^^^^^^^^
1414

1515
error[E0271]: type mismatch resolving `<[static generator@$DIR/src/lib.rs:201:9: 201:67] as Generator<ResumeTy>>::Yield == ()`
16-
--> $DIR/yield_in_async.rs:4:5
16+
--> tests/ui/yield_in_async.rs:4:5
1717
|
1818
4 | / stream! {
1919
5 | | let f = async {
@@ -22,54 +22,11 @@ error[E0271]: type mismatch resolving `<[static generator@$DIR/src/lib.rs:201:9:
2222
8 | |
2323
9 | | let v = f.await;
2424
10 | | };
25-
| |______^ expected `()`, found integer
25+
| |_____^ expected `()`, found integer
2626
|
27-
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
28-
29-
error[E0698]: type inside `async` block must be known in this context
30-
--> $DIR/yield_in_async.rs:6:19
31-
|
32-
6 | yield 123;
33-
| ^^^ cannot infer type for type `{integer}`
34-
|
35-
note: the type is part of the `async` block because of this `yield`
36-
--> $DIR/yield_in_async.rs:6:13
37-
|
38-
6 | yield 123;
39-
| ^^^^^^^^^
40-
41-
error[E0698]: type inside `async` block must be known in this context
42-
--> $DIR/yield_in_async.rs:5:13
43-
|
44-
5 | let f = async {
45-
| ^ cannot infer type for type `{integer}`
46-
|
47-
note: the type is part of the `async` block because of this `await`
48-
--> $DIR/yield_in_async.rs:9:17
49-
|
50-
9 | let v = f.await;
51-
| ^^^^^^^
52-
53-
error[E0698]: type inside `async` block must be known in this context
54-
--> $DIR/yield_in_async.rs:9:17
55-
|
56-
9 | let v = f.await;
57-
| ^ cannot infer type for type `{integer}`
58-
|
59-
note: the type is part of the `async` block because of this `await`
60-
--> $DIR/yield_in_async.rs:9:17
61-
|
62-
9 | let v = f.await;
63-
| ^^^^^^^
64-
65-
error[E0698]: type inside `async` block must be known in this context
66-
--> $DIR/yield_in_async.rs:9:17
67-
|
68-
9 | let v = f.await;
69-
| ^^^^^^^ cannot infer type for type `{integer}`
70-
|
71-
note: the type is part of the `async` block because of this `await`
72-
--> $DIR/yield_in_async.rs:9:17
73-
|
74-
9 | let v = f.await;
75-
| ^^^^^^^
27+
note: required by a bound in `from_generator`
28+
--> $RUST/core/src/future/mod.rs
29+
|
30+
| T: Generator<ResumeTy, Yield = ()>,
31+
| ^^^^^^^^^^ required by this bound in `from_generator`
32+
= note: this error originates in the macro `stream` (in Nightly builds, run with -Z macro-backtrace for more info)

‎async-stream/tests/ui/yield_in_closure.stderr‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
error[E0658]: yield syntax is experimental
2-
--> $DIR/yield_in_closure.rs:7:17
2+
--> tests/ui/yield_in_closure.rs:7:17
33
|
44
7 | yield v;
55
| ^^^^^^^
66
|
77
= note: see issue #43122 <https://github.com/rust-lang/rust/issues/43122> for more information
88

99
error[E0277]: expected a `FnOnce<(&str,)>` closure, found `[generator@$DIR/src/lib.rs:201:9: 201:67]`
10-
--> $DIR/yield_in_closure.rs:6:14
11-
|
12-
6 | .and_then(|v| {
13-
| ^^^^^^^^ expected an `FnOnce<(&str,)>` closure, found `[generator@$DIR/src/lib.rs:201:9: 201:67]`
14-
|
15-
= help: the trait `FnOnce<(&str,)>` is not implemented for `[generator@$DIR/src/lib.rs:201:9: 201:67]`
16-
17-
Some errors have detailed explanations: E0277, E0658.
18-
For more information about an error, try `rustc --explain E0277`.
10+
--> tests/ui/yield_in_closure.rs:6:14
11+
|
12+
6 | .and_then(|v| {
13+
| ^^^^^^^^ expected an `FnOnce<(&str,)>` closure, found `[generator@$DIR/src/lib.rs:201:9: 201:67]`
14+
|
15+
= help: the trait `FnOnce<(&str,)>` is not implemented for `[generator@$DIR/src/lib.rs:201:9: 201:67]`
16+
note: required by a bound in `Result::<T, E>::and_then`
17+
--> $RUST/core/src/result.rs
18+
|
19+
| pub fn and_then<U, F: FnOnce(T) -> Result<U, E>>(self, op: F) -> Result<U, E> {
20+
| ^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Result::<T, E>::and_then`

‎async-stream/tests/ui/yield_in_nested_fn.stderr‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
error[E0658]: yield syntax is experimental
2-
--> $DIR/yield_in_nested_fn.rs:6:13
2+
--> tests/ui/yield_in_nested_fn.rs:6:13
33
|
44
6 | yield "hello";
55
| ^^^^^^^^^^^^^
66
|
77
= note: see issue #43122 <https://github.com/rust-lang/rust/issues/43122> for more information
88

99
error[E0627]: yield expression outside of generator literal
10-
--> $DIR/yield_in_nested_fn.rs:6:13
10+
--> tests/ui/yield_in_nested_fn.rs:6:13
1111
|
1212
6 | yield "hello";
1313
| ^^^^^^^^^^^^^
14-
15-
Some errors have detailed explanations: E0627, E0658.
16-
For more information about an error, try `rustc --explain E0627`.

0 commit comments

Comments
 (0)