From 05003ed4c51399ede05a74bf2b0b0d94f7e28a6a Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 25 Jul 2024 21:30:48 -0400
Subject: [PATCH] Hoist `strum` to workspace level (#15243)

This PR hoists `strum` up to a workspace dependency.

Release Notes:

- N/A
---
 Cargo.toml                       | 6 +++---
 crates/storybook/Cargo.toml      | 2 +-
 crates/theme_importer/Cargo.toml | 2 +-
 crates/ui/Cargo.toml             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 855d7ace1c..325dc0b7ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "crates/activity_indicator",
     "crates/anthropic",
@@ -157,11 +158,9 @@ members = [
     "tooling/xtask",
 ]
 default-members = ["crates/zed"]
-resolver = "2"
 
 [workspace.dependencies]
 activity_indicator = { path = "crates/activity_indicator" }
-aho-corasick = "1.1"
 ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
 assets = { path = "crates/assets" }
@@ -285,6 +284,7 @@ worktree = { path = "crates/worktree" }
 zed = { path = "crates/zed" }
 zed_actions = { path = "crates/zed_actions" }
 
+aho-corasick = "1.1"
 alacritty_terminal = "0.23"
 any_vec = "0.14"
 anyhow = "1.0.86"
@@ -388,6 +388,7 @@ smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2"
 strum = { version = "0.25.0", features = ["derive"] }
 subtle = "2.5.0"
+sys-locale = "0.3.1"
 sysinfo = "0.30.7"
 tempfile = "3.9.0"
 thiserror = "1.0.29"
@@ -442,7 +443,6 @@ wasmtime = { version = "21.0.1", default-features = false, features = [
 wasmtime-wasi = "21.0.1"
 which = "6.0.0"
 wit-component = "0.201"
-sys-locale = "0.3.1"
 
 [workspace.dependencies.windows]
 version = "0.58"
diff --git a/crates/storybook/Cargo.toml b/crates/storybook/Cargo.toml
index 1c58b2f082..3b10d6331b 100644
--- a/crates/storybook/Cargo.toml
+++ b/crates/storybook/Cargo.toml
@@ -31,7 +31,7 @@ rust-embed.workspace = true
 settings.workspace = true
 simplelog.workspace = true
 story.workspace = true
-strum = { version = "0.25.0", features = ["derive"] }
+strum = { workspace = true, features = ["derive"] }
 theme.workspace = true
 title_bar = { workspace = true, features = ["stories"] }
 ui = { workspace = true, features = ["stories"] }
diff --git a/crates/theme_importer/Cargo.toml b/crates/theme_importer/Cargo.toml
index 5d8b0b8c0f..9140ffceb7 100644
--- a/crates/theme_importer/Cargo.toml
+++ b/crates/theme_importer/Cargo.toml
@@ -21,6 +21,6 @@ serde.workspace = true
 serde_json.workspace = true
 serde_json_lenient.workspace = true
 simplelog.workspace= true
-strum = { version = "0.25.0", features = ["derive"] }
+strum = { workspace = true, features = ["derive"] }
 theme.workspace = true
 vscode_theme = "0.2.0"
diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml
index c5cb53d3d2..71e67cb184 100644
--- a/crates/ui/Cargo.toml
+++ b/crates/ui/Cargo.toml
@@ -21,7 +21,7 @@ serde.workspace = true
 settings.workspace = true
 smallvec.workspace = true
 story = { workspace = true, optional = true }
-strum = { version = "0.25.0", features = ["derive"] }
+strum = { workspace = true, features = ["derive"] }
 theme.workspace = true
 
 [target.'cfg(windows)'.dependencies]