From 8f52fd31d2f37c305a868d64b4912cf8cddac1df Mon Sep 17 00:00:00 2001 From: leiysky Date: Tue, 27 Oct 2026 17:09:33 +0800 Subject: [PATCH 1/2] chore: bump tokio to 1.54.1 for security fixes --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 08fcf50..894b622 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -632,9 +632,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.53.1" +version = "1.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed" +checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3" dependencies = [ "pin-project-lite", "tokio-macros", diff --git a/Cargo.toml b/Cargo.toml index f783d74..8a5e8cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ logforth = { version = "0.30.1", default-features = false, features = [ "layout-json", ] } quickcheck = { version = "1.1.0", default-features = false } -tokio = { version = "1.53.1", features = ["rt", "time"] } +tokio = { version = "1.54.1", features = ["rt", "time"] } [workspace.lints.rust] unknown_lints = "deny" From 906a87db7b729599e94d6b3e540d38fcadf56e15 Mon Sep 17 00:00:00 2001 From: leiysky Date: Tue, 27 Oct 2026 17:13:56 +0800 Subject: [PATCH 2/2] test: use stack pinning for the drain waiter --- cache2/src/cache/runtime/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache2/src/cache/runtime/mod.rs b/cache2/src/cache/runtime/mod.rs index ad068a0..23f75ea 100644 --- a/cache2/src/cache/runtime/mod.rs +++ b/cache2/src/cache/runtime/mod.rs @@ -2470,7 +2470,7 @@ mod tests { }); let waker = Waker::from(Arc::clone(&probe)); let mut context = Context::from_waker(&waker); - let mut wait = Box::pin(control.wait_for_drain_async(1)); + let mut wait = std::pin::pin!(control.wait_for_drain_async(1)); assert!(wait.as_mut().poll(&mut context).is_pending()); control.fail(&io::Error::other("test shard failure"));