Remove workspace-hack (#40216)

We've been considering removing workspace-hack for a couple reasons: - Lukas ran into a situation where its build script seemed to be causing spurious rebuilds. This seems more likely to be a cargo bug than an issue with workspace-hack itself (given that it has an empty build script), but we don't necessarily want to take the time to hunt that down right now. - Marshall mentioned hakari interacts poorly with automated crate updates (in our case provided by rennovate) because you'd need to have `cargo hakari generate && cargo hakari manage-deps` after their changes and we prefer to not have actions that make commits. Currently removing workspace-hack causes our workspace to grow from ~1700 to ~2000 crates being built (depending on platform), which is mainly a problem when you're building the whole workspace or running tests across the the normal and remote binaries (which is where feature-unification nets us the most sharing). It doesn't impact incremental times noticeably when you're just iterating on `-p zed`, and we'll hopefully get these savings back in the future when rust-lang/cargo#14774 (which re-implements the functionality of hakari) is finished. Release Notes: - N/A
2025-10-17 11:58:14 -07:00
parent 375a404132
commit ef5b8c6fed
227 changed files with 2035 additions and 3259 deletions
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -1,42 +0,0 @@
-# This file contains settings for `cargo hakari`.
-# See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options.
-
-hakari-package = "workspace-hack"
-
-resolver = "2"
-dep-format-version = "4"
-workspace-hack-line-style = "workspace-dotted"
-
-# this should be the same list as "targets" in ../rust-toolchain.toml
-platforms = [
-    "x86_64-apple-darwin",
-    "aarch64-apple-darwin",
-    "x86_64-unknown-linux-gnu",
-    "aarch64-unknown-linux-gnu",
-    "x86_64-pc-windows-msvc",
-    "x86_64-unknown-linux-musl", # remote server
-]
-
-[traversal-excludes]
-workspace-members = [
-    "remote_server",
-]
-third-party = [
-    { name = "reqwest", version = "0.11.27" },
-    # build of remote_server should not include scap / its x11 dependency
-    { name = "zed-scap", git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197176fb19cd0f9b180dd36eaac", version = "0.0.8-zed" },
-    # build of remote_server should not need to include on libalsa through rodio
-    { name = "rodio", git = "https://github.com/RustAudio/rodio" },
-]
-
-[final-excludes]
-workspace-members = [
-    "zed_extension_api",
-
-    # exclude all extensions
-    "zed_glsl",
-    "zed_html",
-    "zed_proto",
-    "slash_commands_example",
-    "zed_test_extension",
-]
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -130,39 +130,6 @@ jobs:
          input: "crates/proto/proto/"
          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/proto/proto/"

-  workspace_hack:
-    timeout-minutes: 60
-    name: Check workspace-hack crate
-    needs: [job_spec]
-    if: |
-      github.repository_owner == 'zed-industries' &&
-      needs.job_spec.outputs.run_tests == 'true'
-    runs-on:
-      - namespace-profile-8x16-ubuntu-2204
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Add Rust to the PATH
-        run: echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-      - name: Install cargo-hakari
-        uses: clechasseur/rs-cargo@8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386 # v2
-        with:
-          command: install
-          args: cargo-hakari@0.9.35
-
-      - name: Check workspace-hack Cargo.toml is up-to-date
-        run: |
-          cargo hakari generate --diff || {
-            echo "To fix, run script/update-workspace-hack or script/update-workspace-hack.ps1";
-            false
-          }
-      - name: Check all crates depend on workspace-hack
-        run: |
-          cargo hakari manage-deps --dry-run || {
-            echo "To fix, run script/update-workspace-hack or script/update-workspace-hack.ps1"
-            false
-          }
-
  style:
    timeout-minutes: 60
    name: Check formatting and spelling
@@ -507,7 +474,6 @@ jobs:
      - actionlint
      - migration_checks
      # run_tests: If adding required tests, add them here and to script below.
-      - workspace_hack
      - linux_tests
      - build_remote_server
      - macos_tests
@@ -533,7 +499,6 @@ jobs:

          # Only check test jobs if they were supposed to run
          if [[ "${{ needs.job_spec.outputs.run_tests }}" == "true" ]]; then
-            [[ "${{ needs.workspace_hack.result }}"       != 'success' ]] && { RET_CODE=1; echo "Workspace Hack failed"; }
            [[ "${{ needs.macos_tests.result }}"          != 'success' ]] && { RET_CODE=1; echo "macOS tests failed"; }
            [[ "${{ needs.linux_tests.result }}"          != 'success' ]] && { RET_CODE=1; echo "Linux tests failed"; }
            [[ "${{ needs.windows_tests.result }}"        != 'success' ]] && { RET_CODE=1; echo "Windows tests failed"; }
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -218,8 +218,7 @@ members = [
    #

    "tooling/perf",
-    "tooling/workspace-hack",
-    "tooling/xtask", "crates/fs_benchmarks", "crates/worktree_benchmarks",
+    "tooling/xtask",
 ]
 default-members = ["crates/zed"]

@@ -372,7 +371,7 @@ remote_server = { path = "crates/remote_server" }
 repl = { path = "crates/repl" }
 reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
-rodio = { git = "https://github.com/RustAudio/rodio" }
+rodio = { git = "https://github.com/RustAudio/rodio", rev ="e2074c6c2acf07b57cf717e076bdda7a9ac6e70b", features = ["wav", "playback", "wav_output", "recording"] }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 rules_library = { path = "crates/rules_library" }
@@ -438,7 +437,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #

-agent-client-protocol = { version = "0.4.3", features = ["unstable"] }
+agent-client-protocol = { version = "=0.4.3", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = "0.25.1-rc1"
 any_vec = "0.14"
@@ -455,7 +454,7 @@ async-recursion = "1.0.0"
 async-tar = "0.5.0"
 async-task = "4.7"
 async-trait = "0.1"
-async-tungstenite = "0.29.1"
+async-tungstenite = "0.31.0"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 aws-config = { version = "1.6.1", features = ["behavior-version-latest"] }
 aws-credential-types = { version = "1.2.2", features = [
@@ -481,10 +480,10 @@ chrono = { version = "0.4", features = ["serde"] }
 ciborium = "0.2"
 circular-buffer = "1.0"
 clap = { version = "4.4", features = ["derive"] }
-cocoa = "0.26"
-cocoa-foundation = "0.2.0"
+cocoa = "=0.26.0"
+cocoa-foundation = "=0.2.0"
 convert_case = "0.8.0"
-core-foundation = "0.10.0"
+core-foundation = "=0.10.0"
 core-foundation-sys = "0.8.6"
 core-video = { version = "0.4.3", features = ["metal"] }
 cpal = "0.16"
@@ -547,7 +546,7 @@ nix = "0.29"
 num-format = "0.4.4"
 num-traits = "0.2"
 objc = "0.2"
-objc2-foundation = { version = "0.3", default-features = false, features = [
+objc2-foundation = { version = "=0.3.1", default-features = false, features = [
    "NSArray",
    "NSAttributedString",
    "NSBundle",
@@ -713,7 +712,6 @@ wasmtime-wasi = "29"
 which = "6.0.0"
 windows-core = "0.61"
 wit-component = "0.221"
-workspace-hack = "0.1.0"
 yawc = "0.2.5"
 zeroize = "1.8"
 zstd = "0.11"
@@ -774,9 +772,6 @@ notify = { git = "https://github.com/zed-industries/notify.git", rev = "bbb9ea5a
 notify-types = { git = "https://github.com/zed-industries/notify.git", rev = "bbb9ea5ae52b253e095737847e367c30653a2e96" }
 windows-capture = { git = "https://github.com/zed-industries/windows-capture.git", rev = "f0d6c1b6691db75461b732f6d5ff56eed002eeb9" }

-# Makes the workspace hack crate refer to the local one, but only when you're building locally
-workspace-hack = { path = "tooling/workspace-hack" }
-
 [profile.dev]
 split-debuginfo = "unpacked"
 codegen-units = 16
@@ -904,5 +899,4 @@ ignored = [
    "serde",
    "component",
    "documented",
-    "workspace-hack",
 ]
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -45,7 +45,6 @@ url.workspace = true
 util.workspace = true
 uuid.workspace = true
 watch.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 env_logger.workspace = true
--- a/crates/acp_tools/Cargo.toml
+++ b/crates/acp_tools/Cargo.toml
@@ -26,5 +26,4 @@ settings.workspace = true
 theme.workspace = true
 ui.workspace = true
 util.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
--- a/crates/action_log/Cargo.toml
+++ b/crates/action_log/Cargo.toml
@@ -23,7 +23,6 @@ project.workspace = true
 text.workspace = true
 util.workspace = true
 watch.workspace = true
-workspace-hack.workspace = true


 [dev-dependencies]
--- a/crates/activity_indicator/Cargo.toml
+++ b/crates/activity_indicator/Cargo.toml
@@ -25,7 +25,6 @@ proto.workspace = true
 smallvec.workspace = true
 ui.workspace = true
 util.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true

 [dev-dependencies]
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -69,7 +69,6 @@ util.workspace = true
 uuid.workspace = true
 watch.workspace = true
 web_search.workspace = true
-workspace-hack.workspace = true
 zed_env_vars.workspace = true
 zstd.workspace = true

--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -51,7 +51,6 @@ terminal.workspace = true
 uuid.workspace = true
 util.workspace = true
 watch.workspace = true
-workspace-hack.workspace = true

 [target.'cfg(unix)'.dependencies]
 libc.workspace = true
--- a/crates/agent_settings/Cargo.toml
+++ b/crates/agent_settings/Cargo.toml
@@ -24,7 +24,6 @@ schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
 util.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 fs.workspace = true
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -96,7 +96,6 @@ url.workspace = true
 urlencoding.workspace = true
 util.workspace = true
 watch.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true

--- a/crates/ai_onboarding/Cargo.toml
+++ b/crates/ai_onboarding/Cargo.toml
@@ -24,5 +24,4 @@ serde.workspace = true
 smallvec.workspace = true
 telemetry.workspace = true
 ui.workspace = true
-workspace-hack.workspace = true
 zed_actions.workspace = true
--- a/crates/anthropic/Cargo.toml
+++ b/crates/anthropic/Cargo.toml
@@ -26,4 +26,3 @@ serde_json.workspace = true
 settings.workspace = true
 strum.workspace = true
 thiserror.workspace = true
-workspace-hack.workspace = true
--- a/crates/askpass/Cargo.toml
+++ b/crates/askpass/Cargo.toml
@@ -20,7 +20,6 @@ smol.workspace = true
 log.workspace = true
 tempfile.workspace = true
 util.workspace = true
-workspace-hack.workspace = true
 zeroize.workspace = true

 [target.'cfg(target_os = "windows")'.dependencies]
--- a/crates/assets/Cargo.toml
+++ b/crates/assets/Cargo.toml
@@ -15,4 +15,3 @@ workspace = true
 anyhow.workspace = true
 gpui.workspace = true
 rust-embed.workspace = true
-workspace-hack.workspace = true
--- a/crates/assistant_context/Cargo.toml
+++ b/crates/assistant_context/Cargo.toml
@@ -51,7 +51,6 @@ ui.workspace = true
 util.workspace = true
 uuid.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true
 zed_env_vars.workspace = true

 [dev-dependencies]
--- a/crates/assistant_slash_command/Cargo.toml
+++ b/crates/assistant_slash_command/Cargo.toml
@@ -27,7 +27,6 @@ serde_json.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 gpui = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_slash_commands/Cargo.toml
+++ b/crates/assistant_slash_commands/Cargo.toml
@@ -38,7 +38,6 @@ ui.workspace = true
 util.workspace = true
 workspace.workspace = true
 worktree.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 fs = { workspace = true, features = ["test-support"] }
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -21,13 +21,12 @@ gpui.workspace = true
 denoise = { path = "../denoise" }
 log.workspace = true
 parking_lot.workspace = true
-rodio = { workspace = true, features = [ "wav", "playback", "wav_output" ] }
+rodio.workspace = true
 serde.workspace = true
 settings.workspace = true
 smol.workspace = true
 thiserror.workspace = true
 util.workspace = true
-workspace-hack.workspace = true

 [target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
 libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
--- a/crates/auto_update/Cargo.toml
+++ b/crates/auto_update/Cargo.toml
@@ -27,7 +27,6 @@ settings.workspace = true
 smol.workspace = true
 tempfile.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true

 [target.'cfg(not(target_os = "windows"))'.dependencies]
 which.workspace = true
--- a/crates/auto_update_helper/Cargo.toml
+++ b/crates/auto_update_helper/Cargo.toml
@@ -17,7 +17,6 @@ doctest = false
 anyhow.workspace = true
 log.workspace = true
 simplelog.workspace = true
-workspace-hack.workspace = true

 [target.'cfg(target_os = "windows")'.dependencies]
 windows.workspace = true
--- a/crates/auto_update_ui/Cargo.toml
+++ b/crates/auto_update_ui/Cargo.toml
@@ -25,4 +25,3 @@ serde_json.workspace = true
 smol.workspace = true
 util.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true
--- a/crates/aws_http_client/Cargo.toml
+++ b/crates/aws_http_client/Cargo.toml
@@ -18,4 +18,3 @@ default = []
 aws-smithy-runtime-api.workspace = true
 aws-smithy-types.workspace = true
 http_client.workspace = true
-workspace-hack.workspace = true
--- a/crates/bedrock/Cargo.toml
+++ b/crates/bedrock/Cargo.toml
@@ -25,4 +25,3 @@ serde.workspace = true
 serde_json.workspace = true
 strum.workspace = true
 thiserror.workspace = true
-workspace-hack.workspace = true
--- a/crates/breadcrumbs/Cargo.toml
+++ b/crates/breadcrumbs/Cargo.toml
@@ -21,7 +21,6 @@ theme.workspace = true
 ui.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 editor = { workspace = true, features = ["test-support"] }
--- a/crates/buffer_diff/Cargo.toml
+++ b/crates/buffer_diff/Cargo.toml
@@ -27,7 +27,6 @@ rope.workspace = true
 sum_tree.workspace = true
 text.workspace = true
 util.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 ctor.workspace = true
--- a/crates/call/Cargo.toml
+++ b/crates/call/Cargo.toml
@@ -41,7 +41,6 @@ telemetry.workspace = true
 util.workspace = true
 gpui_tokio.workspace = true
 livekit_client.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 client = { workspace = true, features = ["test-support"] }
--- a/crates/channel/Cargo.toml
+++ b/crates/channel/Cargo.toml
@@ -31,7 +31,6 @@ settings.workspace = true
 text.workspace = true
 time.workspace = true
 util.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 collections = { workspace = true, features = ["test-support"] }
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -32,7 +32,6 @@ release_channel.workspace = true
 serde.workspace = true
 util.workspace = true
 tempfile.workspace = true
-workspace-hack.workspace = true

 [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
 exec.workspace = true
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -57,7 +57,6 @@ tokio-socks = { version = "0.5.2", default-features = false, features = ["future
 tokio.workspace = true
 url.workspace = true
 util.workspace = true
-workspace-hack.workspace = true
 worktree.workspace = true

 [dev-dependencies]
--- a/crates/clock/Cargo.toml
+++ b/crates/clock/Cargo.toml
@@ -19,4 +19,3 @@ test-support = ["dep:parking_lot"]
 parking_lot = { workspace = true, optional = true }
 serde.workspace = true
 smallvec.workspace = true
-workspace-hack.workspace = true
--- a/crates/cloud_api_client/Cargo.toml
+++ b/crates/cloud_api_client/Cargo.toml
@@ -20,5 +20,4 @@ gpui_tokio.workspace = true
 http_client.workspace = true
 parking_lot.workspace = true
 serde_json.workspace = true
-workspace-hack.workspace = true
 yawc.workspace = true
--- a/crates/cloud_api_types/Cargo.toml
+++ b/crates/cloud_api_types/Cargo.toml
@@ -17,7 +17,6 @@ chrono.workspace = true
 ciborium.workspace = true
 cloud_llm_client.workspace = true
 serde.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 pretty_assertions.workspace = true
--- a/crates/cloud_llm_client/Cargo.toml
+++ b/crates/cloud_llm_client/Cargo.toml
@@ -21,7 +21,6 @@ serde = { workspace = true, features = ["derive", "rc"] }
 serde_json.workspace = true
 strum = { workspace = true, features = ["derive"] }
 uuid = { workspace = true, features = ["serde"] }
-workspace-hack.workspace = true

 [dev-dependencies]
 pretty_assertions.workspace = true
--- a/crates/cloud_zeta2_prompt/Cargo.toml
+++ b/crates/cloud_zeta2_prompt/Cargo.toml
@@ -19,4 +19,3 @@ ordered-float.workspace = true
 rustc-hash.workspace = true
 serde.workspace = true
 strum.workspace = true
-workspace-hack.workspace = true
--- a/crates/codestral/Cargo.toml
+++ b/crates/codestral/Cargo.toml
@@ -23,6 +23,5 @@ serde.workspace = true
 serde_json.workspace = true
 smol.workspace = true
 text.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -20,7 +20,7 @@ test-support = ["sqlite"]
 [dependencies]
 anyhow.workspace = true
 async-trait.workspace = true
-async-tungstenite.workspace = true
+async-tungstenite = { workspace = true, features = ["tokio", "tokio-rustls-manual-roots" ] }
 aws-config = { version = "1.1.5" }
 aws-sdk-kinesis = "1.51.0"
 aws-sdk-s3 = { version = "1.15.0" }
@@ -47,7 +47,7 @@ reqwest = { version = "0.11", features = ["json"] }
 reqwest_client.workspace = true
 rpc.workspace = true
 scrypt = "0.11"
-sea-orm = { version = "1.1.0-rc.1", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
+sea-orm = { version = "=1.1.10", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
 semantic_version.workspace = true
 semver.workspace = true
 serde.workspace = true
@@ -68,7 +68,6 @@ tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json", "registry", "tracing-log"] } # workaround for https://github.com/tokio-rs/tracing/issues/2927
 util.workspace = true
 uuid.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 agent_settings.workspace = true
@@ -116,7 +115,7 @@ release_channel.workspace = true
 remote = { workspace = true, features = ["test-support"] }
 remote_server.workspace = true
 rpc = { workspace = true, features = ["test-support"] }
-sea-orm = { version = "1.1.0-rc.1", features = ["sqlx-sqlite"] }
+sea-orm = { version = "=1.1.10", features = ["sqlx-sqlite"] }
 serde_json.workspace = true
 session = { workspace = true, features = ["test-support"] }
 settings = { workspace = true, features = ["test-support"] }
--- a/crates/collab/src/db/queries/extensions.rs
+++ b/crates/collab/src/db/queries/extensions.rs
@@ -255,7 +255,7 @@ impl Database {

                let insert = extension::Entity::insert(extension::ActiveModel {
                    name: ActiveValue::Set(latest_version.name.clone()),
-                    external_id: ActiveValue::Set(external_id.to_string()),
+                    external_id: ActiveValue::Set((*external_id).to_owned()),
                    id: ActiveValue::NotSet,
                    latest_version: ActiveValue::Set(latest_version.version.to_string()),
                    total_download_count: ActiveValue::NotSet,
--- a/crates/collab/src/db/queries/notifications.rs
+++ b/crates/collab/src/db/queries/notifications.rs
@@ -17,7 +17,7 @@ impl Database {
                    .any(|existing| existing.name == **kind)
            })
            .map(|kind| notification_kind::ActiveModel {
-                name: ActiveValue::Set(kind.to_string()),
+                name: ActiveValue::Set((*kind).to_owned()),
                ..Default::default()
            })
            .collect();
@@ -260,7 +260,7 @@ pub fn model_to_proto(this: &Database, row: notification::Model) -> Result<proto
        .context("Unknown notification kind")?;
    Ok(proto::Notification {
        id: row.id.to_proto(),
-        kind: kind.to_string(),
+        kind: (*kind).to_owned(),
        timestamp: row.created_at.assume_utc().unix_timestamp() as u64,
        is_read: row.is_read,
        response: row.response,
--- a/crates/collab/src/db/tests.rs
+++ b/crates/collab/src/db/tests.rs
@@ -196,7 +196,7 @@ fn channel_tree(channels: &[(ChannelId, &[ChannelId], &'static str)]) -> Vec<Cha

        result.push(Channel {
            id: *id,
-            name: name.to_string(),
+            name: (*name).to_owned(),
            visibility: ChannelVisibility::Members,
            parent_path: parent_key,
            channel_order: order,
--- a/crates/collab_ui/Cargo.toml
+++ b/crates/collab_ui/Cargo.toml
@@ -60,7 +60,6 @@ title_bar.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 call = { workspace = true, features = ["test-support"] }
--- a/crates/collections/Cargo.toml
+++ b/crates/collections/Cargo.toml
@@ -19,4 +19,3 @@ test-support = []
 [dependencies]
 indexmap.workspace = true
 rustc-hash.workspace = true
-workspace-hack.workspace = true
--- a/crates/command_palette/Cargo.toml
+++ b/crates/command_palette/Cargo.toml
@@ -32,7 +32,6 @@ util.workspace = true
 telemetry.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 ctor.workspace = true
--- a/crates/command_palette_hooks/Cargo.toml
+++ b/crates/command_palette_hooks/Cargo.toml
@@ -16,5 +16,4 @@ doctest = false
 collections.workspace = true
 derive_more.workspace = true
 gpui.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
--- a/crates/component/Cargo.toml
+++ b/crates/component/Cargo.toml
@@ -18,7 +18,6 @@ inventory.workspace = true
 parking_lot.workspace = true
 strum.workspace = true
 theme.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 documented.workspace = true
--- a/crates/context_server/Cargo.toml
+++ b/crates/context_server/Cargo.toml
@@ -32,4 +32,3 @@ smol.workspace = true
 tempfile.workspace = true
 url = { workspace = true, features = ["serde"] }
 util.workspace = true
-workspace-hack.workspace = true
--- a/crates/copilot/Cargo.toml
+++ b/crates/copilot/Cargo.toml
@@ -52,7 +52,6 @@ task.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true
 itertools.workspace = true

 [target.'cfg(windows)'.dependencies]
--- a/crates/crashes/Cargo.toml
+++ b/crates/crashes/Cargo.toml
@@ -17,7 +17,6 @@ smol.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 system_specs.workspace = true
-workspace-hack.workspace = true
 zstd.workspace = true

 [target.'cfg(target_os = "macos")'.dependencies]
--- a/crates/credentials_provider/Cargo.toml
+++ b/crates/credentials_provider/Cargo.toml
@@ -19,4 +19,3 @@ paths.workspace = true
 release_channel.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-workspace-hack.workspace = true
--- a/crates/dap/Cargo.toml
+++ b/crates/dap/Cargo.toml
@@ -49,7 +49,6 @@ smol.workspace = true
 task.workspace = true
 telemetry.workspace = true
 util.workspace = true
-workspace-hack.workspace = true

 [target.'cfg(not(windows))'.dependencies]
 libc.workspace = true
--- a/crates/dap/src/adapters.rs
+++ b/crates/dap/src/adapters.rs
@@ -306,7 +306,7 @@ pub async fn download_adapter_from_github(
    anyhow::ensure!(
        response.status().is_success(),
        "download failed with status {}",
-        response.status().to_string()
+        response.status()
    );

    delegate.output_to_console("Download complete".to_owned());
--- a/crates/dap_adapters/Cargo.toml
+++ b/crates/dap_adapters/Cargo.toml
@@ -39,7 +39,6 @@ shlex.workspace = true
 smol.workspace = true
 task.workspace = true
 util.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 dap = { workspace = true, features = ["test-support"] }
--- a/crates/db/Cargo.toml
+++ b/crates/db/Cargo.toml
@@ -26,7 +26,6 @@ smol.workspace = true
 sqlez.workspace = true
 sqlez_macros.workspace = true
 util.workspace = true
-workspace-hack.workspace = true
 zed_env_vars.workspace = true

 [dev-dependencies]
--- a/crates/debug_adapter_extension/Cargo.toml
+++ b/crates/debug_adapter_extension/Cargo.toml
@@ -15,7 +15,6 @@ gpui.workspace = true
 serde_json.workspace = true
 util.workspace = true
 task.workspace = true
-workspace-hack = { version = "0.1", path = "../../tooling/workspace-hack" }

 [lints]
 workspace = true
--- a/crates/debugger_tools/Cargo.toml
+++ b/crates/debugger_tools/Cargo.toml
@@ -27,4 +27,3 @@ settings.workspace = true
 smol.workspace = true
 util.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true
--- a/crates/debugger_ui/Cargo.toml
+++ b/crates/debugger_ui/Cargo.toml
@@ -73,7 +73,6 @@ tree-sitter.workspace = true
 ui.workspace = true
 unindent = { workspace = true, optional = true }
 util.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true

--- a/crates/deepseek/Cargo.toml
+++ b/crates/deepseek/Cargo.toml
@@ -22,4 +22,3 @@ http_client.workspace = true
 schemars = { workspace = true, optional = true }
 serde.workspace = true
 serde_json.workspace = true
-workspace-hack.workspace = true
--- a/crates/denoise/Cargo.toml
+++ b/crates/denoise/Cargo.toml
@@ -18,4 +18,3 @@ rodio = { workspace = true, features = ["wav_output"] }
 rustfft = { version = "6.2.0", features = ["avx"] }
 realfft = "3.4.0"
 thiserror.workspace = true
-workspace-hack.workspace = true
--- a/crates/diagnostics/Cargo.toml
+++ b/crates/diagnostics/Cargo.toml
@@ -34,7 +34,6 @@ theme.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 client = { workspace = true, features = ["test-support"] }
--- a/crates/docs_preprocessor/Cargo.toml
+++ b/crates/docs_preprocessor/Cargo.toml
@@ -17,7 +17,6 @@ serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 util.workspace = true
-workspace-hack.workspace = true
 zed.workspace = true
 zlog.workspace = true
 task.workspace = true
--- a/crates/edit_prediction/Cargo.toml
+++ b/crates/edit_prediction/Cargo.toml
@@ -15,4 +15,3 @@ path = "src/edit_prediction.rs"
 client.workspace = true
 gpui.workspace = true
 language.workspace = true
-workspace-hack.workspace = true
--- a/crates/edit_prediction_button/Cargo.toml
+++ b/crates/edit_prediction_button/Cargo.toml
@@ -32,7 +32,6 @@ settings.workspace = true
 supermaven.workspace = true
 telemetry.workspace = true
 ui.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
 zeta.workspace = true
--- a/crates/edit_prediction_context/Cargo.toml
+++ b/crates/edit_prediction_context/Cargo.toml
@@ -33,7 +33,6 @@ strum.workspace = true
 text.workspace = true
 tree-sitter.workspace = true
 util.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 clap.workspace = true
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -92,7 +92,6 @@ uuid.workspace = true
 vim_mode_setting.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 criterion.workspace = true
--- a/crates/eval/Cargo.toml
+++ b/crates/eval/Cargo.toml
@@ -68,4 +68,3 @@ unindent.workspace = true
 util.workspace = true
 uuid.workspace = true
 watch.workspace = true
-workspace-hack.workspace = true
--- a/crates/eval/src/examples/threads/overwrite-file.json
+++ b/crates/eval/src/examples/threads/overwrite-file.json
@@ -116,7 +116,7 @@
      ],
      "tool_results": [
        {
-          "content": "[package]\nname = \"language_model_selector\"\nversion = \"0.1.0\"\nedition.workspace = true\npublish.workspace = true\nlicense = \"GPL-3.0-or-later\"\n\n[lints]\nworkspace = true\n\n[lib]\npath = \"src/language_model_selector.rs\"\n\n[dependencies]\ncollections.workspace = true\nfeature_flags.workspace = true\nfuzzy.workspace = true\ngpui.workspace = true\nlanguage_model.workspace = true\nlog.workspace = true\npicker.workspace = true\nproto.workspace = true\nui.workspace = true\nworkspace-hack.workspace = true\nzed_actions.workspace = true\n",
+          "content": "[package]\nname = \"language_model_selector\"\nversion = \"0.1.0\"\nedition.workspace = true\npublish.workspace = true\nlicense = \"GPL-3.0-or-later\"\n\n[lints]\nworkspace = true\n\n[lib]\npath = \"src/language_model_selector.rs\"\n\n[dependencies]\ncollections.workspace = true\nfeature_flags.workspace = true\nfuzzy.workspace = true\ngpui.workspace = true\nlanguage_model.workspace = true\nlog.workspace = true\npicker.workspace = true\nproto.workspace = true\nui.workspace = true\n\nzed_actions.workspace = true\n",
          "is_error": false,
          "output": null,
          "tool_use_id": "toolu_019Je2MLfJhpJr93g5igoRAH"
--- a/crates/explorer_command_injector/Cargo.toml
+++ b/crates/explorer_command_injector/Cargo.toml
@@ -25,4 +25,3 @@ windows-core.workspace = true
 windows-registry = "0.5"

 [dependencies]
-workspace-hack.workspace = true
--- a/crates/extension/Cargo.toml
+++ b/crates/extension/Cargo.toml
@@ -36,7 +36,6 @@ url.workspace = true
 util.workspace = true
 wasm-encoder.workspace = true
 wasmparser.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 pretty_assertions.workspace = true
--- a/crates/extension_cli/Cargo.toml
+++ b/crates/extension_cli/Cargo.toml
@@ -30,4 +30,3 @@ tokio = { workspace = true, features = ["full"] }
 toml.workspace = true
 tree-sitter.workspace = true
 wasmtime.workspace = true
-workspace-hack.workspace = true
--- a/crates/extension_host/Cargo.toml
+++ b/crates/extension_host/Cargo.toml
@@ -51,7 +51,6 @@ util.workspace = true
 wasmparser.workspace = true
 wasmtime-wasi.workspace = true
 wasmtime.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 criterion.workspace = true
--- a/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs
+++ b/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs
@@ -520,7 +520,7 @@ impl ExtensionImports for WasmState {
            anyhow::ensure!(
                response.status().is_success(),
                "download failed with status {}",
-                response.status().to_string()
+                response.status()
            );
            let body = BufReader::new(response.body_mut());

--- a/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs
+++ b/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs
@@ -1051,7 +1051,7 @@ impl ExtensionImports for WasmState {
            anyhow::ensure!(
                response.status().is_success(),
                "download failed with status {}",
-                response.status().to_string()
+                response.status()
            );
            let body = BufReader::new(response.body_mut());

--- a/crates/extensions_ui/Cargo.toml
+++ b/crates/extensions_ui/Cargo.toml
@@ -38,7 +38,6 @@ theme.workspace = true
 ui.workspace = true
 util.workspace = true
 vim_mode_setting.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true

--- a/crates/feature_flags/Cargo.toml
+++ b/crates/feature_flags/Cargo.toml
@@ -15,4 +15,3 @@ path = "src/feature_flags.rs"
 futures.workspace = true
 gpui.workspace = true
 smol.workspace = true
-workspace-hack.workspace = true
--- a/crates/feedback/Cargo.toml
+++ b/crates/feedback/Cargo.toml
@@ -19,7 +19,6 @@ gpui.workspace = true
 system_specs.workspace = true
 urlencoding.workspace = true
 util.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true

--- a/crates/file_finder/Cargo.toml
+++ b/crates/file_finder/Cargo.toml
@@ -32,7 +32,6 @@ theme.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 ctor.workspace = true
--- a/crates/file_icons/Cargo.toml
+++ b/crates/file_icons/Cargo.toml
@@ -17,4 +17,3 @@ gpui.workspace = true
 serde.workspace = true
 theme.workspace = true
 util.workspace = true
-workspace-hack.workspace = true
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -33,7 +33,6 @@ tempfile.workspace = true
 text.workspace = true
 time.workspace = true
 util.workspace = true
-workspace-hack.workspace = true

 [target.'cfg(target_os = "macos")'.dependencies]
 fsevent.workspace = true
--- a/crates/fs_benchmarks/Cargo.toml
+++ b/crates/fs_benchmarks/Cargo.toml
@@ -1,13 +0,0 @@
-[package]
-name = "fs_benchmarks"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-
-[dependencies]
-fs.workspace = true
-gpui = {workspace = true, features = ["windows-manifest"]}
-workspace-hack.workspace = true
-
-[lints]
-workspace = true
--- a/crates/fsevent/Cargo.toml
+++ b/crates/fsevent/Cargo.toml
@@ -16,7 +16,6 @@ doctest = false
 bitflags.workspace = true
 parking_lot.workspace = true
 log.workspace = true
-workspace-hack.workspace = true

 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation.workspace = true
--- a/crates/fuzzy/Cargo.toml
+++ b/crates/fuzzy/Cargo.toml
@@ -16,7 +16,6 @@ doctest = false
 gpui.workspace = true
 util.workspace = true
 log.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 util = {workspace = true, features = ["test-support"]}
--- a/crates/git/Cargo.toml
+++ b/crates/git/Cargo.toml
@@ -41,7 +41,6 @@ urlencoding.workspace = true
 util.workspace = true
 uuid.workspace = true
 futures.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 pretty_assertions.workspace = true
--- a/crates/git_hosting_providers/Cargo.toml
+++ b/crates/git_hosting_providers/Cargo.toml
@@ -24,7 +24,6 @@ serde_json.workspace = true
 settings.workspace = true
 url.workspace = true
 util.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 indoc.workspace = true
--- a/crates/git_ui/Cargo.toml
+++ b/crates/git_ui/Cargo.toml
@@ -58,7 +58,6 @@ time_format.workspace = true
 ui.workspace = true
 util.workspace = true
 watch.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
 zeroize.workspace = true
--- a/crates/go_to_line/Cargo.toml
+++ b/crates/go_to_line/Cargo.toml
@@ -24,7 +24,6 @@ theme.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 editor = { workspace = true, features = ["test-support"] }
--- a/crates/google_ai/Cargo.toml
+++ b/crates/google_ai/Cargo.toml
@@ -23,4 +23,3 @@ serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 strum.workspace = true
-workspace-hack.workspace = true
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -133,13 +133,13 @@ util.workspace = true
 uuid.workspace = true
 waker-fn = "1.2.0"
 lyon = "1.0"
-workspace-hack.workspace = true
 libc.workspace = true
 pin-project = "1.1.10"

 [target.'cfg(target_os = "macos")'.dependencies]
 block = "0.1"
 cocoa.workspace = true
+cocoa-foundation.workspace = true
 core-foundation.workspace = true
 core-foundation-sys.workspace = true
 core-graphics = "0.24"
--- a/crates/gpui_macros/Cargo.toml
+++ b/crates/gpui_macros/Cargo.toml
@@ -22,7 +22,6 @@ heck.workspace = true
 proc-macro2.workspace = true
 quote.workspace = true
 syn.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 gpui = { workspace = true, features = ["inspector"] }
--- a/crates/gpui_tokio/Cargo.toml
+++ b/crates/gpui_tokio/Cargo.toml
@@ -17,4 +17,3 @@ anyhow.workspace = true
 util.workspace = true
 gpui.workspace = true
 tokio = { workspace = true, features = ["rt", "rt-multi-thread"] }
-workspace-hack.workspace = true
--- a/crates/html_to_markdown/Cargo.toml
+++ b/crates/html_to_markdown/Cargo.toml
@@ -20,7 +20,6 @@ anyhow.workspace = true
 html5ever.workspace = true
 markup5ever_rcdom.workspace = true
 regex.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 indoc.workspace = true
--- a/crates/http_client/Cargo.toml
+++ b/crates/http_client/Cargo.toml
@@ -35,4 +35,3 @@ sha2.workspace = true
 tempfile.workspace = true
 url.workspace = true
 util.workspace = true
-workspace-hack.workspace = true
--- a/crates/http_client_tls/Cargo.toml
+++ b/crates/http_client_tls/Cargo.toml
@@ -18,4 +18,3 @@ doctest = true
 [dependencies]
 rustls.workspace = true
 rustls-platform-verifier.workspace = true
-workspace-hack.workspace = true
--- a/crates/icons/Cargo.toml
+++ b/crates/icons/Cargo.toml
@@ -14,4 +14,3 @@ path = "src/icons.rs"
 [dependencies]
 serde.workspace = true
 strum.workspace = true
-workspace-hack.workspace = true
--- a/crates/image_viewer/Cargo.toml
+++ b/crates/image_viewer/Cargo.toml
@@ -30,7 +30,6 @@ theme.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 editor = { workspace = true, features = ["test-support"] }
--- a/crates/inspector_ui/Cargo.toml
+++ b/crates/inspector_ui/Cargo.toml
@@ -26,6 +26,5 @@ title_bar.workspace = true
 ui.workspace = true
 util.workspace = true
 util_macros.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
--- a/crates/install_cli/Cargo.toml
+++ b/crates/install_cli/Cargo.toml
@@ -21,5 +21,4 @@ gpui.workspace = true
 release_channel.workspace = true
 smol.workspace = true
 util.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
--- a/crates/journal/Cargo.toml
+++ b/crates/journal/Cargo.toml
@@ -22,7 +22,6 @@ serde.workspace = true
 settings.workspace = true
 shellexpand.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 editor = { workspace = true, features = ["test-support"] }
--- a/crates/json_schema_store/Cargo.toml
+++ b/crates/json_schema_store/Cargo.toml
@@ -30,7 +30,6 @@ snippet_provider.workspace = true
 task.workspace = true
 theme.workspace = true
 util.workspace = true
-workspace-hack.workspace = true



--- a/crates/keymap_editor/Cargo.toml
+++ b/crates/keymap_editor/Cargo.toml
@@ -42,7 +42,6 @@ ui_input.workspace = true
 ui.workspace = true
 util.workspace = true
 vim.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true

--- a/Show More
+++ b/Show More