From 8e3e948b21a3bac670dee4ce5db53f7426cddc5c Mon Sep 17 00:00:00 2001 From: staging-update-bot Date: Thu, 8 Jan 2026 03:35:07 +0000 Subject: [PATCH 1/2] zed/0.218.6 package update --- zed.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zed.yaml b/zed.yaml index 3e8889f4170e..849ed22c12f8 100644 --- a/zed.yaml +++ b/zed.yaml @@ -1,7 +1,7 @@ package: name: zed - version: "0.217.4" - epoch: 1 # GHSA-9c48-w39g-hm26 + version: "0.218.6" + epoch: 0 # GHSA-9c48-w39g-hm26 description: Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter. copyright: - license: GPL-3.0-only @@ -44,7 +44,7 @@ pipeline: with: repository: https://github.com/zed-industries/zed tag: v${{package.version}} - expected-commit: 39c2ebc0db1d1436f3e77090261c77bd66056291 + expected-commit: e8b0ac131bc2bf80056f3769317ef57ebf32d0d1 - uses: patch with: From 19be2a719cfc13387db6734dc0dff78dcc1ab700 Mon Sep 17 00:00:00 2001 From: Amber Arcadia Date: Fri, 9 Jan 2026 13:44:25 -0500 Subject: [PATCH 2/2] Removed obsolete patch --- zed.yaml | 6 +----- zed/fix-smallvec-features.patch | 16 ---------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 zed/fix-smallvec-features.patch diff --git a/zed.yaml b/zed.yaml index 849ed22c12f8..fbbab6e540b8 100644 --- a/zed.yaml +++ b/zed.yaml @@ -2,7 +2,7 @@ package: name: zed version: "0.218.6" epoch: 0 # GHSA-9c48-w39g-hm26 - description: Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter. + description: Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter. copyright: - license: GPL-3.0-only resources: @@ -46,10 +46,6 @@ pipeline: tag: v${{package.version}} expected-commit: e8b0ac131bc2bf80056f3769317ef57ebf32d0d1 - - uses: patch - with: - patches: fix-smallvec-features.patch - - uses: rust/cargobump - runs: | diff --git a/zed/fix-smallvec-features.patch b/zed/fix-smallvec-features.patch deleted file mode 100644 index 0ff74eb69b18..000000000000 --- a/zed/fix-smallvec-features.patch +++ /dev/null @@ -1,16 +0,0 @@ -The codebase has introduced usage of the `const_new` features, but didn't -include it in the set of features for some reason. --- -diff --git a/Cargo.toml b/Cargo.toml -index 0ad4d2b..2b109d0 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -631,7 +631,7 @@ shellexpand = "2.1.0" - shlex = "1.3.0" - simplelog = "0.12.2" - slotmap = "1.0.6" --smallvec = { version = "1.6", features = ["union"] } -+smallvec = { version = "1.6", features = ["union", "const_new"] } - smol = "2.0" - sqlformat = "0.2" - stacksafe = "0.1"