Skip to content

Removed obsolete patch

19be2a7
Select commit
Loading
Failed to load commit list.
Merged

zed/0.218.6 package update #77424

Removed obsolete patch
19be2a7
Select commit
Loading
Failed to load commit list.
Octo STS / staging-autofix succeeded Jan 9, 2026 in 0s

Merge report generated

Merge Report

First Commit SHA: 8e3e948b21a3bac670dee4ce5db53f7426cddc5c

Embeddings Stored

Stored 2 embedding(s) in the vector index:

  • Datapoint ID: 6bc7685c-8f8c-4f84-b5b3-80dd1fe1f4bc
    Error: Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file Cargo.toml.rej

  • Datapoint ID: 6131ded7-500c-494c-8990-c432a0fc9978
    Error: conn read: read tcp 127.0.0.1:60222->127.0.0.1:42995: i/o timeout

Patch

From 19be2a719cfc13387db6734dc0dff78dcc1ab700 Mon Sep 17 00:00:00 2001
From: Amber Arcadia <[email protected]>
Date: Fri, 9 Jan 2026 13:44:25 -0500
Subject: [PATCH] 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 849ed22c12f..fbbab6e540b 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 0ff74eb69b1..00000000000
--- 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"