Skip to content

Commit e40ce2c

Browse files
authored
Update CI config and fix CI failure (#101)
1 parent 3a693e5 commit e40ce2c

File tree

5 files changed

+16
-22
lines changed

5 files changed

+16
-22
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,56 +8,50 @@ on:
88
branches:
99
- master
1010
schedule:
11-
- cron: '0 2 * * *'
11+
- cron: '0 2 * * 0'
1212

1313
env:
1414
RUSTFLAGS: -Dwarnings
1515
RUST_BACKTRACE: 1
16-
# This is the minimum supported Rust version of this crate.
17-
# When updating this, the reminder to update the minimum supported
18-
# Rust version in README.md, Cargo.toml, and .clippy.toml.
19-
minrust: '1.56'
2016

2117
jobs:
2218
test:
2319
runs-on: ubuntu-latest
2420
steps:
25-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2622
- name: Install Rust
2723
run: rustup update stable
2824
- run: rustup component add rust-src
2925
- run: cargo test --all-features
3026

3127
minrust:
32-
env:
33-
CARGO_NET_GIT_FETCH_WITH_CLI: true
3428
runs-on: ubuntu-latest
3529
steps:
36-
- uses: actions/checkout@v3
37-
- name: Install Rust
38-
run: rustup update ${{ env.minrust }} && rustup default ${{ env.minrust }}
39-
- run: cargo build --all-features
30+
- uses: actions/checkout@v4
31+
- name: Install cargo-hack
32+
uses: taiki-e/install-action@cargo-hack
33+
- run: cargo hack build --all-features --ignore-private --rust-version
4034

4135
fmt:
4236
runs-on: ubuntu-latest
4337
steps:
44-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
4539
- name: Install Rust
4640
run: rustup update stable
47-
- run: cargo fmt --all -- --check
41+
- run: cargo fmt --all --check
4842

4943
clippy:
5044
runs-on: ubuntu-latest
5145
steps:
52-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v4
5347
- name: Install Rust
5448
run: rustup update stable
5549
- run: cargo clippy --all-features
5650

5751
docs:
5852
runs-on: ubuntu-latest
5953
steps:
60-
- uses: actions/checkout@v3
54+
- uses: actions/checkout@v4
6155
- name: Install Rust
6256
run: rustup update nightly && rustup default nightly
6357
- run: cargo doc --no-deps --all-features

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
if: github.repository_owner == 'tokio-rs'
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- uses: taiki-e/create-gh-release-action@v1
1515
with:
1616
changelog: async-stream/CHANGELOG.md

async-stream/tests/ui/yield_in_async.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ error[E0658]: yield syntax is experimental
66
|
77
= note: see issue #43122 <https://github.com/rust-lang/rust/issues/43122> for more information
88

9-
error[E0727]: `async` generators are not yet supported
9+
error[E0727]: `async` coroutines are not yet supported
1010
--> tests/ui/yield_in_async.rs:6:13
1111
|
1212
6 | yield 123;

async-stream/tests/ui/yield_in_closure.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ error[E0658]: yield syntax is experimental
66
|
77
= note: see issue #43122 <https://github.com/rust-lang/rust/issues/43122> for more information
88

9-
error[E0277]: expected a `FnOnce<(&str,)>` closure, found `[generator@$DIR/tests/ui/yield_in_closure.rs:6:23: 6:26]`
9+
error[E0277]: expected a `FnOnce(&str)` closure, found `{coroutine@$DIR/tests/ui/yield_in_closure.rs:6:23: 6:26}`
1010
--> tests/ui/yield_in_closure.rs:6:23
1111
|
1212
6 | .and_then(|v| {
@@ -16,9 +16,9 @@ error[E0277]: expected a `FnOnce<(&str,)>` closure, found `[generator@$DIR/tests
1616
7 | | yield v;
1717
8 | | Ok(())
1818
9 | | });
19-
| |_____________^ expected an `FnOnce<(&str,)>` closure, found `[generator@$DIR/tests/ui/yield_in_closure.rs:6:23: 6:26]`
19+
| |_____________^ expected an `FnOnce(&str)` closure, found `{coroutine@$DIR/tests/ui/yield_in_closure.rs:6:23: 6:26}`
2020
|
21-
= help: the trait `FnOnce<(&str,)>` is not implemented for `[generator@$DIR/tests/ui/yield_in_closure.rs:6:23: 6:26]`
21+
= help: the trait `FnOnce<(&str,)>` is not implemented for `{coroutine@$DIR/tests/ui/yield_in_closure.rs:6:23: 6:26}`
2222
note: required by a bound in `Result::<T, E>::and_then`
2323
--> $RUST/core/src/result.rs
2424
|

async-stream/tests/ui/yield_in_nested_fn.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ error[E0658]: yield syntax is experimental
66
|
77
= note: see issue #43122 <https://github.com/rust-lang/rust/issues/43122> for more information
88

9-
error[E0627]: yield expression outside of generator literal
9+
error[E0627]: yield expression outside of coroutine literal
1010
--> tests/ui/yield_in_nested_fn.rs:6:13
1111
|
1212
6 | yield "hello";

0 commit comments

Comments
 (0)