From 0cfc4a483dfab6ca171df0ceedaaa2a9f7954d0e Mon Sep 17 00:00:00 2001 From: Ben Brandt Date: Sat, 14 Nov 2026 11:41:42 +0000 Subject: [PATCH] Switch async-task back to upstream (#66968) Replace the Zed fork of `async-task` with upstream now that https://github.com/smol-rs/async-task/pull/108 has merged. Pin the upstream merge commit `41fd3359c75e221bd8b187a8ee361aa309c1714c` to preserve the task waker identity fix. The latest crates.io release is still 4.7.1 and does not include the fix, so retain the crates.io patch until a release is available. Update the lockfile without changing other dependencies. Release Notes: - N/A --- Cargo.lock | 2 +- Cargo.toml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c34c0b32f9..10437784bbd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1226,7 +1226,7 @@ dependencies = [ [[package]] name = "async-task" version = "4.7.1" -source = "git+https://github.com/zed-industries/async-task.git?rev=015845a19fc31752c02367567d3b8900a406f9da#015845a19fc31752c02367567d3b8900a406f9da" +source = "git+https://github.com/smol-rs/async-task?rev=41fd3359c75e221bd8b187a8ee361aa309c1714c#41fd3359c75e221bd8b187a8ee361aa309c1714c" [[package]] name = "async-trait" diff --git a/Cargo.toml b/Cargo.toml index 46d884889e8..7a53b151ad9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1042,7 +1042,8 @@ cpal = { git = "https://github.com/RustAudio/cpal", rev = "e1612d5d98152f8dc2a62 # constants type-incompatible with `tree_sitter::Language`. tree-sitter-language = { git = "https://github.com/tree-sitter/tree-sitter", rev = "803c6ebaac27d69e1808b45058482e868d073ceb" } async-process = { git = "https://github.com/zed-industries/async-process.git", rev = "0b6d6713570af61806e1e5cb40e0f757cb93fd9d" } -async-task = { git = "https://github.com/zed-industries/async-task.git", rev = "015845a19fc31752c02367567d3b8900a406f9da" } +# Keep the waker identity fix until it is released: https://github.com/smol-rs/async-task/pull/108 +async-task = { git = "https://github.com/smol-rs/async-task", rev = "41fd3359c75e221bd8b187a8ee361aa309c1714c" } windows-capture = { git = "https://github.com/zed-industries/windows-capture.git", rev = "f0d6c1b6691db75461b732f6d5ff56eed002eeb9" } calloop = { git = "https://github.com/zed-industries/calloop", rev = "3759371fee14c40066d64777e2a36b6ffcc22590" } livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "fbda05eb278b4a7c5be8fc9b2a92e9b62e732236" }