diff --git a/zed.yaml b/zed.yaml index 3e8889f4170..fbbab6e540b 100644 --- a/zed.yaml +++ b/zed.yaml @@ -1,8 +1,8 @@ package: name: zed - version: "0.217.4" - epoch: 1 # 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. + version: "0.218.6" + epoch: 0 # GHSA-9c48-w39g-hm26 + description: Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter. copyright: - license: GPL-3.0-only resources: @@ -44,11 +44,7 @@ pipeline: with: repository: https://github.com/zed-industries/zed tag: v${{package.version}} - expected-commit: 39c2ebc0db1d1436f3e77090261c77bd66056291 - - - uses: patch - with: - patches: fix-smallvec-features.patch + expected-commit: e8b0ac131bc2bf80056f3769317ef57ebf32d0d1 - uses: rust/cargobump 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"