From 167970bcce0b625f87bb669cd48c5eb3ce4a17ab Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Tue, 6 Jan 2026 13:28:58 -0500
Subject: [PATCH] Rename visual_test_runner to zed_visual_test_runner (#46171)

This fixes the auto-update failure by ensuring cargo-bundle picks 'zed'
as the first binary.

**Problem:** `cargo metadata` returns binaries alphabetically, so
`visual_test_runner` was coming before `zed`. When cargo-bundle looks
for the first binary to bundle (without `--bin`), it was picking
`visual_test_runner` - which doesn't exist in release builds because it
requires the `visual-tests` feature.

The previous fix (#46163) added `--bin zed` to explicitly select the
binary, but this caused cargo-bundle to use the binary name ('zed')
instead of the bundle metadata name ('Zed Nightly'), breaking
auto-updates.

**Fix:** Rename the binary to `zed_visual_test_runner` so it comes after
`zed` alphabetically. This restores the original bundle script behavior
that has worked for years.

Also reverts the `--bin zed` workaround from #46163.

Release Notes:

- N/A
---
 crates/zed/Cargo.toml                | 2 +-
 crates/zed/src/visual_test_runner.rs | 4 ++--
 docs/src/development/macos.md        | 4 ++--
 script/bundle-mac                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 20cb8b68795..e16aaad3cdb 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -43,7 +43,7 @@ name = "zed"
 path = "src/main.rs"
 
 [[bin]]
-name = "visual_test_runner"
+name = "zed_visual_test_runner"
 path = "src/visual_test_runner.rs"
 required-features = ["visual-tests"]
 
diff --git a/crates/zed/src/visual_test_runner.rs b/crates/zed/src/visual_test_runner.rs
index 392ef2c9d8d..b1d294d912e 100644
--- a/crates/zed/src/visual_test_runner.rs
+++ b/crates/zed/src/visual_test_runner.rs
@@ -14,10 +14,10 @@
 //! ## Usage
 //!
 //! Run the visual tests:
-//!   cargo run -p zed --bin visual_test_runner --features visual-tests
+//!   cargo run -p zed --bin zed_visual_test_runner --features visual-tests
 //!
 //! Update baseline images (when UI intentionally changes):
-//!   UPDATE_BASELINE=1 cargo run -p zed --bin visual_test_runner --features visual-tests
+//!   UPDATE_BASELINE=1 cargo run -p zed --bin zed_visual_test_runner --features visual-tests
 //!
 //! ## Environment Variables
 //!
diff --git a/docs/src/development/macos.md b/docs/src/development/macos.md
index 3d569f9b5d2..53cb3666525 100644
--- a/docs/src/development/macos.md
+++ b/docs/src/development/macos.md
@@ -69,7 +69,7 @@ You must grant Screen Recording permission to your terminal:
 ### Running Visual Tests
 
 ```sh
-cargo run -p zed --bin visual_test_runner --features visual-tests
+cargo run -p zed --bin zed_visual_test_runner --features visual-tests
 ```
 
 ### Updating Baselines
@@ -77,7 +77,7 @@ cargo run -p zed --bin visual_test_runner --features visual-tests
 When UI changes are intentional, update the baseline images:
 
 ```sh
-UPDATE_BASELINE=1 cargo run -p zed --bin visual_test_runner --features visual-tests
+UPDATE_BASELINE=1 cargo run -p zed --bin zed_visual_test_runner --features visual-tests
 ```
 
 Baseline images are stored in `crates/zed/test_fixtures/visual_tests/` and should be committed to the repository.
diff --git a/script/bundle-mac b/script/bundle-mac
index ccb254b57aa..93ea07b1626 100755
--- a/script/bundle-mac
+++ b/script/bundle-mac
@@ -100,7 +100,7 @@ sed \
     "s/package.metadata.bundle-${channel}/package.metadata.bundle/" \
     Cargo.toml
 
-app_path=$(cargo bundle ${build_flag} --target $target_triple --select-workspace-root --bin zed | xargs)
+app_path=$(cargo bundle ${build_flag} --target $target_triple --select-workspace-root | xargs)
 
 mv Cargo.toml.backup Cargo.toml
 popd