tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-08-29 00:00:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tokio-1.51.x (for #8101) into tokio-1.52.x (#8106)

Browse Source
This commit is contained in:
Alice Ryhl
2026-05-02 15:13:06 +02:00
parent d3565a2923 cd1823f43e
commit 9271e3ed05
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+3 -5
View File
@@ -1314,8 +1314,7 @@ jobs:
# Enable all unstable features except `io_uring` and `taskdump`, # Enable all unstable features except `io_uring` and `taskdump`,
# which are Linux-only features. # which are Linux-only features.
RUSTFLAGS="$RUSTFLAGS --cfg tokio_unstable" \ RUSTFLAGS="$RUSTFLAGS --cfg tokio_unstable" \
RUSTDOCFLAGS="--cfg tokio_unstable" \ cargo test \
cargo test \
--features $TOKIO_STABLE_FEATURES,tracing --features $TOKIO_STABLE_FEATURES,tracing
freebsd-docs: freebsd-docs:
@@ -1329,14 +1328,13 @@ jobs:
env: env:
RUSTFLAGS: --cfg docsrs --cfg tokio_unstable RUSTFLAGS: --cfg docsrs --cfg tokio_unstable
RUSTDOCFLAGS: --cfg docsrs --cfg tokio_unstable -Dwarnings RUSTDOCFLAGS: --cfg docsrs --cfg tokio_unstable -Dwarnings
RUST_NIGHTLY: nightly-2025-10-12
with: with:
release: '14.4' release: '14.4'
envs: "TOKIO_STABLE_FEATURES RUST_NIGHTLY RUSTDOCFLAGS RUSTFLAGS" envs: "TOKIO_STABLE_FEATURES RUSTDOCFLAGS RUSTFLAGS"
prepare: | prepare: |
pkg install -y curl pkg install -y curl
curl https://sh.rustup.rs -sSf --output rustup.sh curl https://sh.rustup.rs -sSf --output rustup.sh
sh rustup.sh -y --profile minimal --default-toolchain $RUST_NIGHTLY sh rustup.sh -y --profile minimal --default-toolchain ${{ env.rust_nightly }}
run: | run: |
. $HOME/.cargo/env . $HOME/.cargo/env
# We use `--features $TOKIO_STABLE_FEATURES,io-uring,tracing` instead of # We use `--features $TOKIO_STABLE_FEATURES,io-uring,tracing` instead of