Skip to content

Commit 9271e3e

Browse files
committed
Merge tokio-1.51.x (for #8101) into tokio-1.52.x (#8106)
2 parents d3565a2 + cd1823f commit 9271e3e

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,8 +1314,7 @@ jobs:
13141314
# Enable all unstable features except `io_uring` and `taskdump`,
13151315
# which are Linux-only features.
13161316
RUSTFLAGS="$RUSTFLAGS --cfg tokio_unstable" \
1317-
RUSTDOCFLAGS="--cfg tokio_unstable" \
1318-
cargo test \
1317+
cargo test \
13191318
--features $TOKIO_STABLE_FEATURES,tracing
13201319
13211320
freebsd-docs:
@@ -1329,14 +1328,13 @@ jobs:
13291328
env:
13301329
RUSTFLAGS: --cfg docsrs --cfg tokio_unstable
13311330
RUSTDOCFLAGS: --cfg docsrs --cfg tokio_unstable -Dwarnings
1332-
RUST_NIGHTLY: nightly-2025-10-12
13331331
with:
13341332
release: '14.4'
1335-
envs: "TOKIO_STABLE_FEATURES RUST_NIGHTLY RUSTDOCFLAGS RUSTFLAGS"
1333+
envs: "TOKIO_STABLE_FEATURES RUSTDOCFLAGS RUSTFLAGS"
13361334
prepare: |
13371335
pkg install -y curl
13381336
curl https://sh.rustup.rs -sSf --output rustup.sh
1339-
sh rustup.sh -y --profile minimal --default-toolchain $RUST_NIGHTLY
1337+
sh rustup.sh -y --profile minimal --default-toolchain ${{ env.rust_nightly }}
13401338
run: |
13411339
. $HOME/.cargo/env
13421340
# We use `--features $TOKIO_STABLE_FEATURES,io-uring,tracing` instead of

0 commit comments

Comments
 (0)