Merge branch 'main'

This commit is contained in:
Max Brunsfeld 2024-01-03 12:43:52 -08:00
commit ce4bc994e7
3 changed files with 3 additions and 5 deletions

3
Cargo.lock generated
View file

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

View file

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

View file

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