Merge branch 'main'

Max Brunsfeld created

Change summary

Cargo.lock                  | 3 +--
crates/storybook/Cargo.toml | 3 +--
crates/zed/Cargo.toml       | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)

Detailed changes

Cargo.lock 🔗

@@ -7778,7 +7778,6 @@ dependencies = [
  "story",
  "strum",
  "theme",
- "ui",
  "util",
 ]
 
@@ -10089,7 +10088,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.119.0"
+version = "0.120.0"
 dependencies = [
  "activity_indicator",
  "ai",

crates/storybook/Cargo.toml 🔗

@@ -14,6 +14,7 @@ anyhow.workspace = true
 backtrace-on-stack-overflow = "0.3.0"
 chrono = "0.4"
 clap = { version = "4.4", features = ["derive", "string"] }
+strum = { version = "0.25.0", features = ["derive"] }
 dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }
 editor = { path = "../editor" }
 fuzzy = {  path = "../fuzzy" }
@@ -28,10 +29,8 @@ settings = { path = "../settings" }
 simplelog = "0.9"
 smallvec.workspace = true
 story = { path = "../story" }
-strum = { version = "0.25.0", features = ["derive"] }
 theme = { path = "../theme" }
 menu = { path = "../menu" }
-ui = { path = "../ui", features = ["stories"] }
 util = { path = "../util" }
 picker = { path = "../picker" }
 

crates/zed/Cargo.toml 🔗

@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition = "2021"
 name = "zed"
-version = "0.119.0"
+version = "0.120.0"
 publish = false
 
 [lib]