From f1c70aa804e2587ef1822902b320fd369ed3f50b Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Mon, 13 Oct 2025 11:29:01 +0200 Subject: [PATCH 1/6] ci: update nightly version to 2025-10-12 --- .github/workflows/ci.yml | 2 +- netlify.toml | 11 +---------- target-specs/i686-unknown-linux-gnu.json | 12 +++++++----- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea9891d5a7f..265764ca943 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ env: RUSTUP_WINDOWS_PATH_ADD_BIN: 1 # Change to specific Rust release to pin rust_stable: stable - rust_nightly: nightly-2025-01-25 + rust_nightly: nightly-2025-10-12 # Pin a specific miri version rust_miri_nightly: nightly-2025-06-02 rust_clippy: '1.88' diff --git a/netlify.toml b/netlify.toml index b8888b9d333..aeca95bcc81 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,15 +1,6 @@ [build] - # TODO: unfreeze toolchain - # error[E0557]: feature has been removed - # --> /opt/buildhome/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/lock_api-0.4.13/src/lib.rs:89:29 - # | - # 89 | #![cfg_attr(docsrs, feature(doc_auto_cfg))] - # | ^^^^^^^^^^^^ feature has been removed - # | - # = note: removed in 1.58.0; see Date: Mon, 13 Oct 2025 12:54:29 +0200 Subject: [PATCH 2/6] Disable armv7-sony-vita-newlibeabihf --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 265764ca943..9f1cc16b8eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -494,8 +494,8 @@ jobs: target: - name: x86_64-unknown-haiku exclude_features: "taskdump" # taskdump is only available on Linux - - name: armv7-sony-vita-newlibeabihf - exclude_features: "process,signal,rt-process-signal,full,taskdump" +# - name: armv7-sony-vita-newlibeabihf +# exclude_features: "process,signal,rt-process-signal,full,taskdump" steps: - uses: actions/checkout@v5 - name: Install Rust ${{ env.rust_nightly }} From 79dd393f67bc205d2cb356c562c91b3aad551348 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Mon, 13 Oct 2025 16:45:51 +0200 Subject: [PATCH 3/6] Adjust RUNTIME_SHUTTING_DOWN_ERROR comparison --- tokio/src/process/unix/pidfd_reaper.rs | 33 +++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/tokio/src/process/unix/pidfd_reaper.rs b/tokio/src/process/unix/pidfd_reaper.rs index c87eddf31c2..d1553c334bd 100644 --- a/tokio/src/process/unix/pidfd_reaper.rs +++ b/tokio/src/process/unix/pidfd_reaper.rs @@ -95,14 +95,41 @@ where pidfd: PollEvented, } +fn display_eq(d: impl std::fmt::Display, s: &str) -> bool { + use std::fmt::Write; + + struct FormatEq<'r> { + remainder: &'r str, + unequal: bool, + } + + impl<'r> Write for FormatEq<'r> { + fn write_str(&mut self, s: &str) -> std::fmt::Result { + if !self.unequal { + if let Some(new_remainder) = self.remainder.strip_prefix(s) { + self.remainder = new_remainder; + } else { + self.unequal = true; + } + } + Ok(()) + } + } + + let mut fmt_eq = FormatEq { + remainder: s, + unequal: false, + }; + let _ = write!(fmt_eq, "{d}"); + fmt_eq.remainder.is_empty() && !fmt_eq.unequal +} + #[allow(deprecated)] fn is_rt_shutdown_err(err: &io::Error) -> bool { if let Some(inner) = err.get_ref() { - // Using `Error::description()` is more efficient than `format!("{inner}")`, - // so we use it here even if it is deprecated. err.kind() == io::ErrorKind::Other && inner.source().is_none() - && inner.description() == RUNTIME_SHUTTING_DOWN_ERROR + && display_eq(inner, RUNTIME_SHUTTING_DOWN_ERROR) } else { false } From b4b5984a1ae103728208015876d43ed60319a2ce Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Tue, 14 Oct 2025 10:35:37 +0200 Subject: [PATCH 4/6] Use install-action from main --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f1cc16b8eb..a3a57960f0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -630,7 +630,7 @@ jobs: components: rust-src - name: Install cargo-nextest - uses: taiki-e/install-action@v2 + uses: taiki-e/install-action@main with: tool: cargo-nextest From 6fa456d158ccd9e5fa2baac49f387901538203bc Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Tue, 14 Oct 2025 10:54:33 +0200 Subject: [PATCH 5/6] Add RUSTDOCFLAGS to without AtomicU64 check --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3a57960f0e..7a3e231ab75 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -646,6 +646,7 @@ jobs: cargo test --doc -Zbuild-std --target target-specs/i686-unknown-linux-gnu.json -p tokio --features $TOKIO_STABLE_FEATURES,taskdump env: RUST_TEST_THREADS: 1 + RUSTDOCFLAGS: --cfg tokio_unstable RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_tuning_tests no-atomic-u64-check: From 073a6a4543c4e58480d0d8c38b6442d6f8411845 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Tue, 14 Oct 2025 11:33:00 +0200 Subject: [PATCH 6/6] Revert "Use install-action from main" This reverts commit b4b5984a1ae103728208015876d43ed60319a2ce. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a3e231ab75..c2f89cb6691 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -630,7 +630,7 @@ jobs: components: rust-src - name: Install cargo-nextest - uses: taiki-e/install-action@main + uses: taiki-e/install-action@v2 with: tool: cargo-nextest