diff --git a/Cargo.toml b/Cargo.toml index e2723f5ee7..148ef519c3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [workspace] members = [ - "crates/assets", "crates/activity_indicator", "crates/ai", + "crates/assets", "crates/assistant", "crates/audio", "crates/auto_update", @@ -19,8 +19,6 @@ members = [ "crates/copilot", "crates/copilot_ui", "crates/db", - "crates/refineable", - "crates/refineable/derive_refineable", "crates/diagnostics", "crates/editor", "crates/feature_flags", @@ -32,9 +30,9 @@ members = [ "crates/git", "crates/go_to_line", "crates/gpui", - "crates/gpui_macros", "crates/gpui", "crates/gpui_macros", + "crates/gpui_macros", "crates/install_cli", "crates/journal", "crates/journal", @@ -59,7 +57,10 @@ members = [ "crates/project_symbols", "crates/quick_action_bar", "crates/recent_projects", + "crates/refineable", + "crates/refineable/derive_refineable", "crates/release_channel", + "crates/rich_text", "crates/rope", "crates/rpc", "crates/search", @@ -68,7 +69,7 @@ members = [ "crates/snippet", "crates/sqlez", "crates/sqlez_macros", - "crates/rich_text", + "crates/story", "crates/storybook", "crates/sum_tree", "crates/terminal", @@ -79,11 +80,10 @@ members = [ "crates/theme_selector", "crates/ui", "crates/util", - "crates/story", - "crates/vim", "crates/vcs_menu", - "crates/workspace", + "crates/vim", "crates/welcome", + "crates/workspace", "crates/zed", "crates/zed_actions", ] @@ -91,84 +91,83 @@ default-members = ["crates/zed"] resolver = "2" [workspace.dependencies] -anyhow = { version = "1.0.57" } -async-trait = { version = "0.1" } +anyhow = "1.0.57" async-compression = { version = "0.4", features = ["gzip", "futures-io"] } +async-trait = "0.1" chrono = { version = "0.4", features = ["serde"] } ctor = "0.2.6" -derive_more = { version = "0.99.17" } -env_logger = { version = "0.9" } -futures = { version = "0.3" } -globset = { version = "0.4" } +derive_more = "0.99.17" +env_logger = "0.9" +futures = "0.3" +git2 = { version = "0.15", default-features = false} +globset = "0.4" indoc = "1" # We explicitly disable a http2 support in isahc. isahc = { version = "1.7.2", default-features = false, features = ["static-curl", "text-decoding"] } -lazy_static = { version = "1.4.0" } +lazy_static = "1.4.0" log = { version = "0.4.16", features = ["kv_unstable_serde"] } -ordered-float = { version = "2.1.1" } -parking_lot = { version = "0.11.1" } +ordered-float = "2.1.1" +parking_lot = "0.11.1" postage = { version = "0.5", features = ["futures-traits"] } -prost = { version = "0.8" } -rand = { version = "0.8.5" } +pretty_assertions = "1.3.0" +prost = "0.8" +rand = "0.8.5" refineable = { path = "./crates/refineable" } -regex = { version = "1.5" } -rust-embed = { version = "8.0", features = ["include-exclude"] } +regex = "1.5" rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] } -schemars = { version = "0.8" } +rust-embed = { version = "8.0", features = ["include-exclude"] } +schemars = "0.8" serde = { version = "1.0", features = ["derive", "rc"] } serde_derive = { version = "1.0", features = ["deserialize_in_place"] } serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] } serde_repr = "0.1" smallvec = { version = "1.6", features = ["union"] } -smol = { version = "1.2" } +smol = "1.2" strum = { version = "0.25.0", features = ["derive"] } sysinfo = "0.29.10" -tempfile = { version = "3.9.0" } -thiserror = { version = "1.0.29" } -time = { version = "0.3", features = ["serde", "serde-well-known"] } -toml = { version = "0.5" } +tempfile = "3.9.0" +thiserror = "1.0.29" tiktoken-rs = "0.5.7" -tree-sitter = { version = "0.20" } -unindent = { version = "0.1.7" } -pretty_assertions = "1.3.0" -git2 = { version = "0.15", default-features = false} -url = "2.2" -uuid = { version = "1.1.2", features = ["v4"] } - +time = { version = "0.3", features = ["serde", "serde-well-known"] } +toml = "0.5" +tree-sitter = "0.20" tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" } tree-sitter-c = "0.20.1" -tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev="f44509141e7e483323d2ec178f2d2e6c0fc041c1" } tree-sitter-c-sharp = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "dd5e59721a5f8dae34604060833902b882023aaf" } +tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev="f44509141e7e483323d2ec178f2d2e6c0fc041c1" } tree-sitter-css = { git = "https://github.com/tree-sitter/tree-sitter-css", rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" } tree-sitter-elixir = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "a2861e88a730287a60c11ea9299c033c7d076e30" } -tree-sitter-elm = { git = "https://github.com/elm-tooling/tree-sitter-elm", rev = "692c50c0b961364c40299e73c1306aecb5d20f40"} +tree-sitter-elm = { git = "https://github.com/elm-tooling/tree-sitter-elm", rev = "692c50c0b961364c40299e73c1306aecb5d20f40" } tree-sitter-embedded-template = "0.20.0" -tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3" } tree-sitter-gleam = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "58b7cac8fc14c92b0677c542610d8738c373fa81" } +tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3" } tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "aeb2f33b366fd78d5789ff104956ce23508b85db" } -tree-sitter-heex = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" } -tree-sitter-json = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "40a81c01a40ac48744e0c8ccabbaba1920441199" } -tree-sitter-rust = "0.20.3" -tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" } -tree-sitter-php = "0.21.1" -tree-sitter-proto = {git = "https://github.com/rewinfrey/tree-sitter-proto", rev = "36d54f288aee112f13a67b550ad32634d0c2cb52"} -tree-sitter-purescript = { git = "https://github.com/ivanmoreau/tree-sitter-purescript", rev = "a37140f0c7034977b90faa73c94fcb8a5e45ed08" } -tree-sitter-python = "0.20.2" -tree-sitter-toml = { git = "https://github.com/tree-sitter/tree-sitter-toml", rev = "342d9be207c2dba869b9967124c679b5e6fd0ebe" } -tree-sitter-typescript = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259" } -tree-sitter-ruby = "0.20.0" tree-sitter-haskell = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "cf98de23e4285b8e6bcb57b050ef2326e2cc284b" } +tree-sitter-heex = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" } tree-sitter-html = "0.19.0" -tree-sitter-scheme = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "af0fd1fa452cb2562dc7b5c8a8c55551c39273b9" } -tree-sitter-svelte = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "697bb515471871e85ff799ea57a76298a71a9cca" } -tree-sitter-racket = { git = "https://github.com/zed-industries/tree-sitter-racket", rev = "eb010cf2c674c6fd9a6316a84e28ef90190fe51a" } -tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "f545a41f57502e1b5ddf2a6668896c1b0620f930" } +tree-sitter-json = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "40a81c01a40ac48744e0c8ccabbaba1920441199" } tree-sitter-lua = "0.0.14" +tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" } tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7" } tree-sitter-nu = { git = "https://github.com/nushell/tree-sitter-nu", rev = "26bbaecda0039df4067861ab38ea8ea169f7f5aa" } -tree-sitter-vue = { git = "https://github.com/zed-industries/tree-sitter-vue", rev = "6608d9d60c386f19d80af7d8132322fa11199c42" } +tree-sitter-php = "0.21.1" +tree-sitter-proto = {git = "https://github.com/rewinfrey/tree-sitter-proto", rev = "36d54f288aee112f13a67b550ad32634d0c2cb52" } +tree-sitter-purescript = { git = "https://github.com/ivanmoreau/tree-sitter-purescript", rev = "a37140f0c7034977b90faa73c94fcb8a5e45ed08" } +tree-sitter-python = "0.20.2" +tree-sitter-racket = { git = "https://github.com/zed-industries/tree-sitter-racket", rev = "eb010cf2c674c6fd9a6316a84e28ef90190fe51a" } +tree-sitter-ruby = "0.20.0" +tree-sitter-rust = "0.20.3" +tree-sitter-scheme = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "af0fd1fa452cb2562dc7b5c8a8c55551c39273b9" } +tree-sitter-svelte = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "697bb515471871e85ff799ea57a76298a71a9cca" } +tree-sitter-toml = { git = "https://github.com/tree-sitter/tree-sitter-toml", rev = "342d9be207c2dba869b9967124c679b5e6fd0ebe" } +tree-sitter-typescript = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259" } tree-sitter-uiua = { git = "https://github.com/shnarazk/tree-sitter-uiua", rev = "9260f11be5900beda4ee6d1a24ab8ddfaf5a19b2" } +tree-sitter-vue = { git = "https://github.com/zed-industries/tree-sitter-vue", rev = "6608d9d60c386f19d80af7d8132322fa11199c42" } +tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "f545a41f57502e1b5ddf2a6668896c1b0620f930" } tree-sitter-zig = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "0d08703e4c3f426ec61695d7617415fff97029bd" } +unindent = "0.1.7" +url = "2.2" +uuid = { version = "1.1.2", features = ["v4"] } [patch.crates-io] tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "31c40449749c4263a91a43593831b82229049a4c" } diff --git a/crates/activity_indicator/Cargo.toml b/crates/activity_indicator/Cargo.toml index 6f0ca876c7..8c438db31d 100644 --- a/crates/activity_indicator/Cargo.toml +++ b/crates/activity_indicator/Cargo.toml @@ -10,20 +10,19 @@ path = "src/activity_indicator.rs" doctest = false [dependencies] +anyhow.workspace = true auto_update = { path = "../auto_update" } editor = { path = "../editor" } -language = { path = "../language" } +futures.workspace = true gpui = { path = "../gpui" } +language = { path = "../language" } project = { path = "../project" } settings = { path = "../settings" } +smallvec.workspace = true +theme = { path = "../theme" } ui = { path = "../ui" } util = { path = "../util" } -theme = { path = "../theme" } workspace = { path = "../workspace", package = "workspace" } -anyhow.workspace = true -futures.workspace = true -smallvec.workspace = true - [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } diff --git a/crates/ai/Cargo.toml b/crates/ai/Cargo.toml index 85dc53b1be..516514e768 100644 --- a/crates/ai/Cargo.toml +++ b/crates/ai/Cargo.toml @@ -13,27 +13,27 @@ doctest = false test-support = [] [dependencies] -gpui = { path = "../gpui" } -util = { path = "../util" } -language = { path = "../language" } -async-trait.workspace = true anyhow.workspace = true +async-trait.workspace = true +bincode = "1.3.3" futures.workspace = true +gpui = { path = "../gpui" } +isahc.workspace = true +language = { path = "../language" } lazy_static.workspace = true +log.workspace = true +matrixmultiply = "0.3.7" ordered-float.workspace = true parking_lot.workspace = true -isahc.workspace = true -regex.workspace = true -serde.workspace = true -serde_json.workspace = true +parse_duration = "2.1.1" postage.workspace = true rand.workspace = true -log.workspace = true -parse_duration = "2.1.1" -tiktoken-rs.workspace = true -matrixmultiply = "0.3.7" +regex.workspace = true rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] } -bincode = "1.3.3" +serde.workspace = true +serde_json.workspace = true +tiktoken-rs.workspace = true +util = { path = "../util" } [dev-dependencies] gpui = { path = "../gpui", features = ["test-support"] } diff --git a/crates/assets/Cargo.toml b/crates/assets/Cargo.toml index 253e4af4ce..54100afd3c 100644 --- a/crates/assets/Cargo.toml +++ b/crates/assets/Cargo.toml @@ -6,6 +6,6 @@ publish = false license = "GPL-3.0-or-later" [dependencies] +anyhow.workspace = true gpui = {path = "../gpui"} rust-embed.workspace = true -anyhow.workspace = true diff --git a/crates/assistant/Cargo.toml b/crates/assistant/Cargo.toml index ca93f5bdf7..180f3f6c2e 100644 --- a/crates/assistant/Cargo.toml +++ b/crates/assistant/Cargo.toml @@ -11,45 +11,43 @@ doctest = false [dependencies] ai = { path = "../ai" } +anyhow.workspace = true +chrono.workspace = true client = { path = "../client" } collections = { path = "../collections"} editor = { path = "../editor" } fs = { path = "../fs" } -gpui = { path = "../gpui" } -language = { path = "../language" } -menu = { path = "../menu" } -multi_buffer = { path = "../multi_buffer" } -project = { path = "../project" } -search = { path = "../search" } -semantic_index = { path = "../semantic_index" } -settings = { path = "../settings" } -theme = { path = "../theme" } -ui = { path = "../ui" } -util = { path = "../util" } -workspace = { path = "../workspace" } - -uuid.workspace = true -log.workspace = true -anyhow.workspace = true -chrono.workspace = true futures.workspace = true +gpui = { path = "../gpui" } indoc.workspace = true isahc.workspace = true +language = { path = "../language" } +log.workspace = true +menu = { path = "../menu" } +multi_buffer = { path = "../multi_buffer" } ordered-float.workspace = true parking_lot.workspace = true +project = { path = "../project" } regex.workspace = true schemars.workspace = true +search = { path = "../search" } +semantic_index = { path = "../semantic_index" } serde.workspace = true serde_json.workspace = true +settings = { path = "../settings" } smol.workspace = true +theme = { path = "../theme" } tiktoken-rs.workspace = true +ui = { path = "../ui" } +util = { path = "../util" } +uuid.workspace = true +workspace = { path = "../workspace" } [dev-dependencies] -ai = { path = "../ai", features = ["test-support"]} -editor = { path = "../editor", features = ["test-support"] } -project = { path = "../project", features = ["test-support"] } - +ai = { path = "../ai", features = ["test-support"] } ctor.workspace = true +editor = { path = "../editor", features = ["test-support"] } env_logger.workspace = true log.workspace = true +project = { path = "../project", features = ["test-support"] } rand.workspace = true diff --git a/crates/auto_update/Cargo.toml b/crates/auto_update/Cargo.toml index dbd06832ba..c89f1d40fe 100644 --- a/crates/auto_update/Cargo.toml +++ b/crates/auto_update/Cargo.toml @@ -10,23 +10,23 @@ path = "src/auto_update.rs" doctest = false [dependencies] -db = { path = "../db" } -client = { path = "../client" } -gpui = { path = "../gpui" } -menu = { path = "../menu" } -project = { path = "../project" } -release_channel = { path = "../release_channel" } -settings = { path = "../settings" } -theme = { path = "../theme" } -workspace = { path = "../workspace" } -util = { path = "../util" } anyhow.workspace = true +client = { path = "../client" } +db = { path = "../db" } +gpui = { path = "../gpui" } isahc.workspace = true lazy_static.workspace = true log.workspace = true +menu = { path = "../menu" } +project = { path = "../project" } +release_channel = { path = "../release_channel" } schemars.workspace = true serde.workspace = true serde_derive.workspace = true serde_json.workspace = true +settings = { path = "../settings" } smol.workspace = true tempfile.workspace = true +theme = { path = "../theme" } +util = { path = "../util" } +workspace = { path = "../workspace" } diff --git a/crates/breadcrumbs/Cargo.toml b/crates/breadcrumbs/Cargo.toml index 03f0a85250..a2048084fe 100644 --- a/crates/breadcrumbs/Cargo.toml +++ b/crates/breadcrumbs/Cargo.toml @@ -13,15 +13,15 @@ doctest = false collections = { path = "../collections" } editor = { path = "../editor" } gpui = { path = "../gpui" } -ui = { path = "../ui" } +itertools = "0.10" language = { path = "../language" } +outline = { path = "../outline" } project = { path = "../project" } search = { path = "../search" } settings = { path = "../settings" } theme = { path = "../theme" } +ui = { path = "../ui" } workspace = { path = "../workspace" } -outline = { path = "../outline" } -itertools = "0.10" [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } diff --git a/crates/call/Cargo.toml b/crates/call/Cargo.toml index 968db6eed8..9d4b51e659 100644 --- a/crates/call/Cargo.toml +++ b/crates/call/Cargo.toml @@ -20,36 +20,35 @@ test-support = [ ] [dependencies] +anyhow.workspace = true +async-broadcast = "0.4" audio = { path = "../audio" } client = { path = "../client" } collections = { path = "../collections" } -gpui = { path = "../gpui" } -log.workspace = true -live_kit_client = { path = "../live_kit_client" } fs = { path = "../fs" } -language = { path = "../language" } -media = { path = "../media" } -project = { path = "../project" } -settings = { path = "../settings" } -util = { path = "../util" } - -anyhow.workspace = true -async-broadcast = "0.4" futures.workspace = true +gpui = { path = "../gpui" } image = "0.23" +language = { path = "../language" } +live_kit_client = { path = "../live_kit_client" } +log.workspace = true +media = { path = "../media" } postage.workspace = true +project = { path = "../project" } schemars.workspace = true serde.workspace = true -serde_json.workspace = true serde_derive.workspace = true +serde_json.workspace = true +settings = { path = "../settings" } smallvec.workspace = true +util = { path = "../util" } [dev-dependencies] client = { path = "../client", features = ["test-support"] } -fs = { path = "../fs", features = ["test-support"] } -language = { path = "../language", features = ["test-support"] } collections = { path = "../collections", features = ["test-support"] } +fs = { path = "../fs", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } +language = { path = "../language", features = ["test-support"] } live_kit_client = { path = "../live_kit_client", features = ["test-support"] } project = { path = "../project", features = ["test-support"] } util = { path = "../util", features = ["test-support"] } diff --git a/crates/channel/Cargo.toml b/crates/channel/Cargo.toml index 8c3e6dea21..afb5799b61 100644 --- a/crates/channel/Cargo.toml +++ b/crates/channel/Cargo.toml @@ -13,39 +13,38 @@ doctest = false test-support = ["collections/test-support", "gpui/test-support", "rpc/test-support"] [dependencies] +anyhow.workspace = true client = { path = "../client" } +clock = { path = "../clock" } collections = { path = "../collections" } db = { path = "../db" } -gpui = { path = "../gpui" } -util = { path = "../util" } -rpc = { path = "../rpc" } -text = { path = "../text" } -language = { path = "../language" } -release_channel = { path = "../release_channel" } -settings = { path = "../settings" } feature_flags = { path = "../feature_flags" } -sum_tree = { path = "../sum_tree" } -clock = { path = "../clock" } - -anyhow.workspace = true futures.workspace = true +gpui = { path = "../gpui" } image = "0.23" +language = { path = "../language" } lazy_static.workspace = true -smallvec.workspace = true log.workspace = true parking_lot.workspace = true postage.workspace = true rand.workspace = true +release_channel = { path = "../release_channel" } +rpc = { path = "../rpc" } schemars.workspace = true +serde.workspace = true +serde_derive.workspace = true +settings = { path = "../settings" } +smallvec.workspace = true smol.workspace = true +sum_tree = { path = "../sum_tree" } +tempfile.workspace = true +text = { path = "../text" } thiserror.workspace = true time.workspace = true tiny_http = "0.8" -uuid.workspace = true url.workspace = true -serde.workspace = true -serde_derive.workspace = true -tempfile = "3" +util = { path = "../util" } +uuid.workspace = true [dev-dependencies] collections = { path = "../collections", features = ["test-support"] } diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index 7cf00e7df0..37d617821e 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -41,7 +41,7 @@ serde_derive.workspace = true serde_json.workspace = true smol.workspace = true sysinfo.workspace = true -tempfile = "3" +tempfile.workspace = true thiserror.workspace = true time.workspace = true tiny_http = "0.8" diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index ec5de4a9a0..6b8af7db23 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -15,26 +15,22 @@ name = "seed" required-features = ["seed-support"] [dependencies] -clock = { path = "../clock" } -collections = { path = "../collections" } -live_kit_server = { path = "../live_kit_server" } -text = { path = "../text" } -rpc = { path = "../rpc" } -util = { path = "../util" } - anyhow.workspace = true async-tungstenite = "0.16" axum = { version = "0.5", features = ["json", "headers", "ws"] } axum-extra = { version = "0.3", features = ["erased-json"] } base64 = "0.13" -clap = { version = "3.1", features = ["derive"], optional = true } chrono.workspace = true +clap = { version = "3.1", features = ["derive"], optional = true } +clock = { path = "../clock" } +collections = { path = "../collections" } dashmap = "5.4" envy = "0.4.2" futures.workspace = true hyper = "0.14" lazy_static.workspace = true lipsum = { version = "0.8", optional = true } +live_kit_server = { path = "../live_kit_server" } log.workspace = true nanoid = "0.4" parking_lot.workspace = true @@ -42,62 +38,62 @@ prometheus = "0.13" prost.workspace = true rand.workspace = true reqwest = { version = "0.11", features = ["json"], optional = true } +rpc = { path = "../rpc" } scrypt = "0.7" -smallvec.workspace = true sea-orm = { version = "0.12.x", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] } serde.workspace = true serde_derive.workspace = true serde_json.workspace = true sha-1 = "0.9" +smallvec.workspace = true sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] } +text = { path = "../text" } time.workspace = true tokio = { version = "1", features = ["full"] } tokio-tungstenite = "0.17" +toml.workspace = true tonic = "0.6" tower = "0.4" -toml.workspace = true tracing = "0.1.34" tracing-log = "0.1.3" tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] } +util = { path = "../util" } uuid.workspace = true [dev-dependencies] +async-trait.workspace = true audio = { path = "../audio" } -collections = { path = "../collections", features = ["test-support"] } -gpui = { path = "../gpui", features = ["test-support"] } call = { path = "../call", features = ["test-support"] } -client = { path = "../client", features = ["test-support"] } channel = { path = "../channel" } +client = { path = "../client", features = ["test-support"] } +collab_ui = { path = "../collab_ui", features = ["test-support"] } +collections = { path = "../collections", features = ["test-support"] } +ctor.workspace = true editor = { path = "../editor", features = ["test-support"] } -language = { path = "../language", features = ["test-support"] } +env_logger.workspace = true +file_finder = { path = "../file_finder"} fs = { path = "../fs", features = ["test-support"] } git = { path = "../git", features = ["test-support"] } +gpui = { path = "../gpui", features = ["test-support"] } +indoc.workspace = true +language = { path = "../language", features = ["test-support"] } +lazy_static.workspace = true live_kit_client = { path = "../live_kit_client", features = ["test-support"] } lsp = { path = "../lsp", features = ["test-support"] } +menu = { path = "../menu"} node_runtime = { path = "../node_runtime" } notifications = { path = "../notifications", features = ["test-support"] } -file_finder = { path = "../file_finder"} -menu = { path = "../menu"} - +pretty_assertions.workspace = true project = { path = "../project", features = ["test-support"] } rpc = { path = "../rpc", features = ["test-support"] } -settings = { path = "../settings", features = ["test-support"] } -theme = { path = "../theme" } -workspace = { path = "../workspace", features = ["test-support"] } - -collab_ui = { path = "../collab_ui", features = ["test-support"] } - -async-trait.workspace = true -pretty_assertions.workspace = true -ctor.workspace = true -env_logger.workspace = true -indoc.workspace = true -util = { path = "../util" } -lazy_static.workspace = true sea-orm = { version = "0.12.x", features = ["sqlx-sqlite"] } serde_json.workspace = true +settings = { path = "../settings", features = ["test-support"] } sqlx = { version = "0.7", features = ["sqlite"] } +theme = { path = "../theme" } unindent.workspace = true +util = { path = "../util" } +workspace = { path = "../workspace", features = ["test-support"] } [features] seed-support = ["clap", "lipsum", "reqwest"] diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml index b158d528b3..82de5384b3 100644 --- a/crates/collab_ui/Cargo.toml +++ b/crates/collab_ui/Cargo.toml @@ -25,50 +25,47 @@ test-support = [ ] [dependencies] +anyhow.workspace = true auto_update = { path = "../auto_update" } -db = { path = "../db" } call = { path = "../call" } -client = { path = "../client" } channel = { path = "../channel" } +client = { path = "../client" } clock = { path = "../clock" } collections = { path = "../collections" } -# context_menu = { path = "../context_menu" } -# drag_and_drop = { path = "../drag_and_drop" } +db = { path = "../db" } editor = { path = "../editor" } +feature_flags = { path = "../feature_flags" } feedback = { path = "../feedback" } -fuzzy = { path = "../fuzzy" } +futures.workspace = true +fuzzy = { path = "../fuzzy" } gpui = { path = "../gpui" } language = { path = "../language" } -menu = { path = "../menu" } -notifications = { path = "../notifications" } -rich_text = { path = "../rich_text" } -picker = { path = "../picker" } -project = { path = "../project" } -recent_projects = { path = "../recent_projects" } -rpc = { path = "../rpc" } -settings = { path = "../settings" } -story = { path = "../story", optional = true } -feature_flags = { path = "../feature_flags"} -theme = { path = "../theme" } -theme_selector = { path = "../theme_selector" } -vcs_menu = { path = "../vcs_menu" } -ui = { path = "../ui" } -util = { path = "../util" } -workspace = { path = "../workspace" } -zed_actions = { path = "../zed_actions"} - -anyhow.workspace = true -futures.workspace = true lazy_static.workspace = true log.workspace = true +menu = { path = "../menu" } +notifications = { path = "../notifications" } parking_lot.workspace = true -schemars.workspace = true +picker = { path = "../picker" } postage.workspace = true +project = { path = "../project" } +recent_projects = { path = "../recent_projects" } +rich_text = { path = "../rich_text" } +rpc = { path = "../rpc" } +schemars.workspace = true serde.workspace = true serde_derive.workspace = true serde_json.workspace = true -time.workspace = true +settings = { path = "../settings" } smallvec.workspace = true +story = { path = "../story", optional = true } +theme = { path = "../theme" } +theme_selector = { path = "../theme_selector" } +time.workspace = true +ui = { path = "../ui" } +util = { path = "../util" } +vcs_menu = { path = "../vcs_menu" } +workspace = { path = "../workspace" } +zed_actions = { path = "../zed_actions" } [dev-dependencies] call = { path = "../call", features = ["test-support"] } @@ -77,11 +74,10 @@ collections = { path = "../collections", features = ["test-support"] } editor = { path = "../editor", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } notifications = { path = "../notifications", features = ["test-support"] } +pretty_assertions.workspace = true project = { path = "../project", features = ["test-support"] } rpc = { path = "../rpc", features = ["test-support"] } settings = { path = "../settings", features = ["test-support"] } +tree-sitter-markdown.workspace = true util = { path = "../util", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] } - -pretty_assertions.workspace = true -tree-sitter-markdown.workspace = true diff --git a/crates/color/Cargo.toml b/crates/color/Cargo.toml index ae3622e11f..84fe609703 100644 --- a/crates/color/Cargo.toml +++ b/crates/color/Cargo.toml @@ -14,6 +14,6 @@ path = "src/color.rs" doctest = true [dependencies] -story = { path = "../story", optional = true } itertools = { version = "0.11.0", optional = true } palette = "0.7.3" +story = { path = "../story", optional = true } diff --git a/crates/command_palette/Cargo.toml b/crates/command_palette/Cargo.toml index 3591bf016b..6665193403 100644 --- a/crates/command_palette/Cargo.toml +++ b/crates/command_palette/Cargo.toml @@ -10,6 +10,7 @@ path = "src/command_palette.rs" doctest = false [dependencies] +anyhow.workspace = true client = { path = "../client" } collections = { path = "../collections" } # HACK: We're only depending on `copilot` here for `CommandPaletteFilter`. See the attached comment on that type. @@ -20,23 +21,22 @@ gpui = { path = "../gpui" } picker = { path = "../picker" } project = { path = "../project" } release_channel = { path = "../release_channel" } +serde.workspace = true settings = { path = "../settings" } theme = { path = "../theme" } ui = { path = "../ui" } util = { path = "../util" } workspace = { path = "../workspace" } zed_actions = { path = "../zed_actions" } -anyhow.workspace = true -serde.workspace = true [dev-dependencies] -gpui = { path = "../gpui", features = ["test-support"] } +ctor.workspace = true editor = { path = "../editor", features = ["test-support"] } -language = { path = "../language", features = ["test-support"] } -project = { path = "../project", features = ["test-support"] } -menu = { path = "../menu" } +env_logger.workspace = true go_to_line = { path = "../go_to_line" } +gpui = { path = "../gpui", features = ["test-support"] } +language = { path = "../language", features = ["test-support"] } +menu = { path = "../menu" } +project = { path = "../project", features = ["test-support"] } serde_json.workspace = true workspace = { path = "../workspace", features = ["test-support"] } -ctor.workspace = true -env_logger.workspace = true diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml index 46cce455f1..2f9c577c1d 100644 --- a/crates/copilot/Cargo.toml +++ b/crates/copilot/Cargo.toml @@ -20,24 +20,23 @@ test-support = [ ] [dependencies] -collections = { path = "../collections" } -# context_menu = { path = "../context_menu" } -gpui = { path = "../gpui" } -language = { path = "../language" } -settings = { path = "../settings" } -theme = { path = "../theme" } -lsp = { path = "../lsp" } -node_runtime = { path = "../node_runtime"} -util = { path = "../util" } +anyhow.workspace = true async-compression.workspace = true async-tar = "0.4.2" -anyhow.workspace = true +collections = { path = "../collections" } +futures.workspace = true +gpui = { path = "../gpui" } +language = { path = "../language" } log.workspace = true +lsp = { path = "../lsp" } +node_runtime = { path = "../node_runtime"} +parking_lot.workspace = true serde.workspace = true serde_derive.workspace = true +settings = { path = "../settings" } smol.workspace = true -futures.workspace = true -parking_lot.workspace = true +theme = { path = "../theme" } +util = { path = "../util" } [dev-dependencies] clock = { path = "../clock" } diff --git a/crates/copilot_ui/Cargo.toml b/crates/copilot_ui/Cargo.toml index 4c9b590dc8..3d3f37ca6b 100644 --- a/crates/copilot_ui/Cargo.toml +++ b/crates/copilot_ui/Cargo.toml @@ -10,20 +10,20 @@ path = "src/copilot_ui.rs" doctest = false [dependencies] +anyhow.workspace = true copilot = { path = "../copilot" } editor = { path = "../editor" } fs = { path = "../fs" } -zed_actions = { path = "../zed_actions"} +futures.workspace = true gpui = { path = "../gpui" } language = { path = "../language" } settings = { path = "../settings" } +smol.workspace = true theme = { path = "../theme" } ui = { path = "../ui" } util = { path = "../util" } workspace = {path = "../workspace" } -anyhow.workspace = true -smol.workspace = true -futures.workspace = true +zed_actions = { path = "../zed_actions"} [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml index 492c2fb004..5a70f2a937 100644 --- a/crates/db/Cargo.toml +++ b/crates/db/Cargo.toml @@ -13,23 +13,23 @@ doctest = false test-support = [] [dependencies] +anyhow.workspace = true +async-trait.workspace = true collections = { path = "../collections" } gpui = { path = "../gpui" } -release_channel = { path = "../release_channel" } -sqlez = { path = "../sqlez" } -sqlez_macros = { path = "../sqlez_macros" } -util = { path = "../util" } -anyhow.workspace = true indoc.workspace = true -async-trait.workspace = true lazy_static.workspace = true log.workspace = true parking_lot.workspace = true +release_channel = { path = "../release_channel" } serde.workspace = true serde_derive.workspace = true smol.workspace = true +sqlez = { path = "../sqlez" } +sqlez_macros = { path = "../sqlez_macros" } +util = { path = "../util" } [dev-dependencies] -gpui = { path = "../gpui", features = ["test-support"] } env_logger.workspace = true +gpui = { path = "../gpui", features = ["test-support"] } tempfile.workspace = true diff --git a/crates/diagnostics/Cargo.toml b/crates/diagnostics/Cargo.toml index 2e162c1938..6ceaf56f72 100644 --- a/crates/diagnostics/Cargo.toml +++ b/crates/diagnostics/Cargo.toml @@ -10,35 +10,33 @@ path = "src/diagnostics.rs" doctest = false [dependencies] +anyhow.workspace = true collections = { path = "../collections" } editor = { path = "../editor" } -gpui = { path = "../gpui" } -ui = { path = "../ui" } -language = { path = "../language" } -lsp = { path = "../lsp" } -project = { path = "../project" } -settings = { path = "../settings" } -theme = { path = "../theme" } -util = { path = "../util" } -workspace = {path = "../workspace" } - -log.workspace = true -anyhow.workspace = true futures.workspace = true +gpui = { path = "../gpui" } +language = { path = "../language" } +log.workspace = true +lsp = { path = "../lsp" } +postage.workspace = true +project = { path = "../project" } schemars.workspace = true serde.workspace = true serde_derive.workspace = true +settings = { path = "../settings" } smallvec.workspace = true -postage.workspace = true +theme = { path = "../theme" } +ui = { path = "../ui" } +util = { path = "../util" } +workspace = {path = "../workspace" } [dev-dependencies] client = { path = "../client", features = ["test-support"] } editor = { path = "../editor", features = ["test-support"] } +gpui = { path = "../gpui", features = ["test-support"] } language = { path = "../language", features = ["test-support"] } lsp = { path = "../lsp", features = ["test-support"] } -gpui = { path = "../gpui", features = ["test-support"] } -workspace = {path = "../workspace", features = ["test-support"] } -theme = { path = "../theme", features = ["test-support"] } - serde_json.workspace = true +theme = { path = "../theme", features = ["test-support"] } unindent.workspace = true +workspace = {path = "../workspace", features = ["test-support"] } diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml index bd117d10a4..b5067afbf2 100644 --- a/crates/editor/Cargo.toml +++ b/crates/editor/Cargo.toml @@ -24,72 +24,68 @@ test-support = [ ] [dependencies] +aho-corasick = "1.1" +anyhow.workspace = true client = { path = "../client" } clock = { path = "../clock" } +collections = { path = "../collections" } +convert_case = "0.6.0" copilot = { path = "../copilot" } db = { path = "../db" } -collections = { path = "../collections" } -# context_menu = { path = "../context_menu" } +futures.workspace = true fuzzy = { path = "../fuzzy" } git = { path = "../git" } gpui = { path = "../gpui" } -language = { path = "../language" } -lsp = { path = "../lsp" } -multi_buffer = { path = "../multi_buffer" } -project = { path = "../project" } -rpc = { path = "../rpc" } -rich_text = { path = "../rich_text" } -settings = { path = "../settings" } -snippet = { path = "../snippet" } -sum_tree = { path = "../sum_tree" } -text = { path = "../text" } -theme = { path = "../theme" } -ui = { path = "../ui" } -util = { path = "../util" } -sqlez = { path = "../sqlez" } -workspace = { path = "../workspace" } - -aho-corasick = "1.1" -anyhow.workspace = true -convert_case = "0.6.0" -futures.workspace = true indoc = "1.0.4" itertools = "0.10" +language = { path = "../language" } lazy_static.workspace = true log.workspace = true +lsp = { path = "../lsp" } +multi_buffer = { path = "../multi_buffer" } ordered-float.workspace = true parking_lot.workspace = true postage.workspace = true +project = { path = "../project" } rand.workspace = true +rich_text = { path = "../rich_text" } +rpc = { path = "../rpc" } schemars.workspace = true serde.workspace = true -serde_json.workspace = true serde_derive.workspace = true +serde_json.workspace = true +settings = { path = "../settings" } smallvec.workspace = true smol.workspace = true -url.workspace = true - -tree-sitter-rust = { workspace = true, optional = true } +snippet = { path = "../snippet" } +sqlez = { path = "../sqlez" } +sum_tree = { path = "../sum_tree" } +text = { path = "../text" } +theme = { path = "../theme" } tree-sitter-html = { workspace = true, optional = true } +tree-sitter-rust = { workspace = true, optional = true } tree-sitter-typescript = { workspace = true, optional = true } +ui = { path = "../ui" } +url.workspace = true +util = { path = "../util" } +workspace = { path = "../workspace" } [dev-dependencies] copilot = { path = "../copilot", features = ["test-support"] } -text = { path = "../text", features = ["test-support"] } -language = { path = "../language", features = ["test-support"] } -lsp = { path = "../lsp", features = ["test-support"] } -gpui = { path = "../gpui", features = ["test-support"] } -util = { path = "../util", features = ["test-support"] } -project = { path = "../project", features = ["test-support"] } -settings = { path = "../settings", features = ["test-support"] } -workspace = { path = "../workspace", features = ["test-support"] } -multi_buffer = { path = "../multi_buffer", features = ["test-support"] } - ctor.workspace = true env_logger.workspace = true +gpui = { path = "../gpui", features = ["test-support"] } +language = { path = "../language", features = ["test-support"] } +lsp = { path = "../lsp", features = ["test-support"] } +multi_buffer = { path = "../multi_buffer", features = ["test-support"] } +project = { path = "../project", features = ["test-support"] } rand.workspace = true -unindent.workspace = true -tree-sitter.workspace = true -tree-sitter-rust.workspace = true +settings = { path = "../settings", features = ["test-support"] } +text = { path = "../text", features = ["test-support"] } tree-sitter-html.workspace = true +tree-sitter-rust.workspace = true tree-sitter-typescript.workspace = true +tree-sitter.workspace = true +unindent.workspace = true +util = { path = "../util", features = ["test-support"] } +workspace = { path = "../workspace", features = ["test-support"] } diff --git a/crates/feature_flags/Cargo.toml b/crates/feature_flags/Cargo.toml index cb25ccc9b4..20c106393f 100644 --- a/crates/feature_flags/Cargo.toml +++ b/crates/feature_flags/Cargo.toml @@ -9,5 +9,5 @@ license = "GPL-3.0-or-later" path = "src/feature_flags.rs" [dependencies] -gpui = { path = "../gpui" } anyhow.workspace = true +gpui = { path = "../gpui" } diff --git a/crates/feedback/Cargo.toml b/crates/feedback/Cargo.toml index cbdd903b2d..fdac5dd6a6 100644 --- a/crates/feedback/Cargo.toml +++ b/crates/feedback/Cargo.toml @@ -12,38 +12,36 @@ path = "src/feedback.rs" test-support = [] [dependencies] +anyhow.workspace = true +bitflags = "2.4.1" client = { path = "../client" } db = { path = "../db" } editor = { path = "../editor" } -gpui = { path = "../gpui" } -language = { path = "../language" } -menu = { path = "../menu" } -project = { path = "../project" } -release_channel = { path = "../release_channel" } -settings = { path = "../settings" } -theme = { path = "../theme" } -ui = { path = "../ui" } -util = { path = "../util" } -workspace = { path = "../workspace"} - -bitflags = "2.4.1" -human_bytes = "0.4.1" - -anyhow.workspace = true futures.workspace = true +gpui = { path = "../gpui" } +human_bytes = "0.4.1" isahc.workspace = true +language = { path = "../language" } lazy_static.workspace = true log.workspace = true +menu = { path = "../menu" } postage.workspace = true +project = { path = "../project" } regex.workspace = true +release_channel = { path = "../release_channel" } serde.workspace = true serde_derive.workspace = true serde_json.workspace = true +settings = { path = "../settings" } smallvec.workspace = true smol.workspace = true sysinfo.workspace = true +theme = { path = "../theme" } tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" } +ui = { path = "../ui" } urlencoding = "2.1.2" +util = { path = "../util" } +workspace = { path = "../workspace"} [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } diff --git a/crates/file_finder/Cargo.toml b/crates/file_finder/Cargo.toml index 42369e6dc4..56b644e7f8 100644 --- a/crates/file_finder/Cargo.toml +++ b/crates/file_finder/Cargo.toml @@ -10,30 +10,29 @@ path = "src/file_finder.rs" doctest = false [dependencies] -editor = { path = "../editor" } +anyhow.workspace = true collections = { path = "../collections" } +editor = { path = "../editor" } fuzzy = { path = "../fuzzy" } gpui = { path = "../gpui" } menu = { path = "../menu" } picker = { path = "../picker" } +postage.workspace = true project = { path = "../project" } +serde.workspace = true settings = { path = "../settings" } text = { path = "../text" } -util = { path = "../util" } theme = { path = "../theme" } ui = { path = "../ui" } +util = { path = "../util" } workspace = { path = "../workspace" } -postage.workspace = true -anyhow.workspace = true -serde.workspace = true [dev-dependencies] +ctor.workspace = true editor = { path = "../editor", features = ["test-support"] } +env_logger.workspace = true gpui = { path = "../gpui", features = ["test-support"] } language = { path = "../language", features = ["test-support"] } -workspace = { path = "../workspace", features = ["test-support"] } -theme = { path = "../theme", features = ["test-support"] } - serde_json.workspace = true -ctor.workspace = true -env_logger.workspace = true +theme = { path = "../theme", features = ["test-support"] } +workspace = { path = "../workspace", features = ["test-support"] } diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml index aea2db8ab3..debdefe3ce 100644 --- a/crates/fs/Cargo.toml +++ b/crates/fs/Cargo.toml @@ -18,7 +18,7 @@ sum_tree = { path = "../sum_tree" } anyhow.workspace = true async-trait.workspace = true futures.workspace = true -tempfile = "3" +tempfile.workspace = true lazy_static.workspace = true parking_lot.workspace = true smol.workspace = true diff --git a/crates/git/Cargo.toml b/crates/git/Cargo.toml index f48aafd37c..2d4b652069 100644 --- a/crates/git/Cargo.toml +++ b/crates/git/Cargo.toml @@ -10,18 +10,18 @@ path = "src/git.rs" [dependencies] anyhow.workspace = true -clock = { path = "../clock" } -lazy_static.workspace = true -sum_tree = { path = "../sum_tree" } -text = { path = "../text" } -collections = { path = "../collections" } -util = { path = "../util" } -log.workspace = true -smol.workspace = true -parking_lot.workspace = true async-trait.workspace = true +clock = { path = "../clock" } +collections = { path = "../collections" } futures.workspace = true git2.workspace = true +lazy_static.workspace = true +log.workspace = true +parking_lot.workspace = true +smol.workspace = true +sum_tree = { path = "../sum_tree" } +text = { path = "../text" } +util = { path = "../util" } [dev-dependencies] unindent.workspace = true diff --git a/crates/go_to_line/Cargo.toml b/crates/go_to_line/Cargo.toml index b90b9cc81e..1968e2dadf 100644 --- a/crates/go_to_line/Cargo.toml +++ b/crates/go_to_line/Cargo.toml @@ -13,14 +13,14 @@ doctest = false editor = { path = "../editor" } gpui = { path = "../gpui" } menu = { path = "../menu" } +postage.workspace = true serde.workspace = true settings = { path = "../settings" } text = { path = "../text" } -workspace = { path = "../workspace" } -postage.workspace = true theme = { path = "../theme" } ui = { path = "../ui" } util = { path = "../util" } +workspace = { path = "../workspace" } [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml index 66acb0c1e6..0bc28b8db4 100644 --- a/crates/gpui/Cargo.toml +++ b/crates/gpui/Cargo.toml @@ -15,22 +15,22 @@ path = "src/gpui.rs" doctest = false [dependencies] -collections = { path = "../collections" } -gpui_macros = { path = "../gpui_macros" } -util = { path = "../util" } -sum_tree = { path = "../sum_tree" } +anyhow.workspace = true async-task = "4.7" backtrace = { version = "0.3", optional = true } +bitflags = "2.4.0" +collections = { path = "../collections" } ctor.workspace = true -linkme = "0.3" derive_more.workspace = true dhat = { version = "0.3", optional = true } env_logger = { version = "0.9", optional = true } etagere = "0.2" futures.workspace = true +gpui_macros = { path = "../gpui_macros" } image = "0.23" itertools = "0.10" lazy_static.workspace = true +linkme = "0.3" log.workspace = true num_cpus = "1.13" ordered-float.workspace = true @@ -39,26 +39,26 @@ parking_lot.workspace = true pathfinder_geometry = "0.5" postage.workspace = true rand.workspace = true +raw-window-handle = "0.6.0" refineable.workspace = true resvg = "0.14" +schemars.workspace = true seahash = "4.1" serde.workspace = true serde_derive.workspace = true serde_json.workspace = true +slotmap = "1.0.6" smallvec.workspace = true smol.workspace = true +sum_tree = { path = "../sum_tree" } taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "1876f72bee5e376023eaa518aa7b8a34c769bd1b" } thiserror.workspace = true time.workspace = true tiny-skia = "0.5" usvg = { version = "0.14", features = [] } +util = { path = "../util" } uuid = { version = "1.1.2", features = ["v4"] } waker-fn = "1.1.0" -slotmap = "1.0.6" -schemars.workspace = true -bitflags = "2.4.0" -anyhow.workspace = true -raw-window-handle = "0.6.0" [dev-dependencies] backtrace = "0.3" @@ -74,7 +74,6 @@ bindgen = "0.65.1" cbindgen = "0.26.0" [target.'cfg(target_os = "macos")'.dependencies] -media = { path = "../media" } block = "0.1" cocoa = "0.25" core-foundation = { version = "0.9.3", features = ["with-uuid"] } @@ -83,5 +82,6 @@ core-text = "19.2" font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "d97147f" } foreign-types = "0.3" log.workspace = true +media = { path = "../media" } metal = "0.21.0" objc = "0.2" diff --git a/crates/gpui_macros/Cargo.toml b/crates/gpui_macros/Cargo.toml index a347ffc6e7..f5a7589139 100644 --- a/crates/gpui_macros/Cargo.toml +++ b/crates/gpui_macros/Cargo.toml @@ -10,6 +10,6 @@ path = "src/gpui_macros.rs" proc-macro = true [dependencies] -syn = { version = "1.0.72", features = ["full"] } -quote = "1.0.9" proc-macro2 = "1.0.66" +quote = "1.0.9" +syn = { version = "1.0.72", features = ["full"] } diff --git a/crates/install_cli/Cargo.toml b/crates/install_cli/Cargo.toml index ede2abcf0d..d50ab5191a 100644 --- a/crates/install_cli/Cargo.toml +++ b/crates/install_cli/Cargo.toml @@ -12,8 +12,8 @@ path = "src/install_cli.rs" test-support = [] [dependencies] -smol.workspace = true anyhow.workspace = true -log.workspace = true gpui = { path = "../gpui" } +log.workspace = true +smol.workspace = true util = { path = "../util" } diff --git a/crates/journal/Cargo.toml b/crates/journal/Cargo.toml index d73718c8d7..9330a2efff 100644 --- a/crates/journal/Cargo.toml +++ b/crates/journal/Cargo.toml @@ -10,18 +10,18 @@ path = "src/journal.rs" doctest = false [dependencies] -editor = { path = "../editor" } -gpui = { path = "../gpui" } -util = { path = "../util" } -workspace = { path = "../workspace" } -settings = { path = "../settings" } anyhow.workspace = true chrono = "0.4" dirs = "4.0" -serde.workspace = true -schemars.workspace = true +editor = { path = "../editor" } +gpui = { path = "../gpui" } log.workspace = true +schemars.workspace = true +serde.workspace = true +settings = { path = "../settings" } shellexpand = "2.1.0" +util = { path = "../util" } +workspace = { path = "../workspace" } [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml index 3d0e57dbc8..cf8801e857 100644 --- a/crates/language/Cargo.toml +++ b/crates/language/Cargo.toml @@ -23,65 +23,62 @@ test-support = [ ] [dependencies] -clock = { path = "../clock" } -collections = { path = "../collections" } -fuzzy = { path = "../fuzzy" } -git = { path = "../git" } -gpui = { path = "../gpui" } -lsp = { path = "../lsp" } -rpc = { path = "../rpc" } -settings = { path = "../settings" } -sum_tree = { path = "../sum_tree" } -text = { path = "../text" } -theme = { path = "../theme" } -util = { path = "../util" } - anyhow.workspace = true async-broadcast = "0.4" async-trait.workspace = true +clock = { path = "../clock" } +collections = { path = "../collections" } futures.workspace = true +fuzzy = { path = "../fuzzy" } +git = { path = "../git" } globset.workspace = true +gpui = { path = "../gpui" } lazy_static.workspace = true log.workspace = true +lsp = { path = "../lsp" } parking_lot.workspace = true postage.workspace = true +pulldown-cmark = { version = "0.9.2", default-features = false } +rand = { workspace = true, optional = true } regex.workspace = true +rpc = { path = "../rpc" } schemars.workspace = true serde.workspace = true serde_derive.workspace = true serde_json.workspace = true +settings = { path = "../settings" } similar = "1.3" smallvec.workspace = true smol.workspace = true -tree-sitter.workspace = true -unicase = "2.6" - -rand = { workspace = true, optional = true } +sum_tree = { path = "../sum_tree" } +text = { path = "../text" } +theme = { path = "../theme" } tree-sitter-rust = { workspace = true, optional = true } tree-sitter-typescript = { workspace = true, optional = true } -pulldown-cmark = { version = "0.9.2", default-features = false } +tree-sitter.workspace = true +unicase = "2.6" +util = { path = "../util" } [dev-dependencies] client = { path = "../client", features = ["test-support"] } collections = { path = "../collections", features = ["test-support"] } -gpui = { path = "../gpui", features = ["test-support"] } -lsp = { path = "../lsp", features = ["test-support"] } -text = { path = "../text", features = ["test-support"] } -settings = { path = "../settings", features = ["test-support"] } -util = { path = "../util", features = ["test-support"] } ctor.workspace = true env_logger.workspace = true +gpui = { path = "../gpui", features = ["test-support"] } indoc.workspace = true +lsp = { path = "../lsp", features = ["test-support"] } rand.workspace = true -unindent.workspace = true - +settings = { path = "../settings", features = ["test-support"] } +text = { path = "../text", features = ["test-support"] } +tree-sitter-elixir.workspace = true tree-sitter-embedded-template.workspace = true +tree-sitter-heex.workspace = true tree-sitter-html.workspace = true tree-sitter-json.workspace = true tree-sitter-markdown.workspace = true -tree-sitter-rust.workspace = true tree-sitter-python.workspace = true -tree-sitter-typescript.workspace = true tree-sitter-ruby.workspace = true -tree-sitter-elixir.workspace = true -tree-sitter-heex.workspace = true +tree-sitter-rust.workspace = true +tree-sitter-typescript.workspace = true +unindent.workspace = true +util = { path = "../util", features = ["test-support"] } diff --git a/crates/language_selector/Cargo.toml b/crates/language_selector/Cargo.toml index bc7ebf4e87..adeb9359d2 100644 --- a/crates/language_selector/Cargo.toml +++ b/crates/language_selector/Cargo.toml @@ -10,18 +10,18 @@ path = "src/language_selector.rs" doctest = false [dependencies] +anyhow.workspace = true editor = { path = "../editor" } fuzzy = { path = "../fuzzy" } -language = { path = "../language" } gpui = { path = "../gpui" } +language = { path = "../language" } picker = { path = "../picker" } project = { path = "../project" } +settings = { path = "../settings" } theme = { path = "../theme" } ui = { path = "../ui" } -settings = { path = "../settings" } util = { path = "../util" } workspace = { path = "../workspace" } -anyhow.workspace = true [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } diff --git a/crates/language_tools/Cargo.toml b/crates/language_tools/Cargo.toml index dc6d64c13d..d32677fd6e 100644 --- a/crates/language_tools/Cargo.toml +++ b/crates/language_tools/Cargo.toml @@ -10,27 +10,27 @@ path = "src/language_tools.rs" doctest = false [dependencies] +anyhow.workspace = true collections = { path = "../collections" } editor = { path = "../editor" } +futures.workspace = true +gpui = { path = "../gpui" } +language = { path = "../language" } +lsp = { path = "../lsp" } +project = { path = "../project" } +serde.workspace = true +serde_json.workspace = true settings = { path = "../settings" } theme = { path = "../theme" } -language = { path = "../language" } -project = { path = "../project" } -workspace = { path = "../workspace" } -gpui = { path = "../gpui" } +tree-sitter.workspace = true ui = { path = "../ui" } util = { path = "../util" } -lsp = { path = "../lsp" } -futures.workspace = true -serde.workspace = true -anyhow.workspace = true -tree-sitter.workspace = true -serde_json.workspace = true +workspace = { path = "../workspace" } [dev-dependencies] client = { path = "../client", features = ["test-support"] } editor = { path = "../editor", features = ["test-support"] } -gpui = { path = "../gpui", features = ["test-support"] } -util = { path = "../util", features = ["test-support"] } env_logger.workspace = true +gpui = { path = "../gpui", features = ["test-support"] } unindent.workspace = true +util = { path = "../util", features = ["test-support"] } diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml index 0eae185c0a..32c180c48c 100644 --- a/crates/live_kit_client/Cargo.toml +++ b/crates/live_kit_client/Cargo.toml @@ -23,21 +23,19 @@ test-support = [ ] [dependencies] -collections = { path = "../collections", optional = true } -gpui = { path = "../gpui", optional = true } -live_kit_server = { path = "../live_kit_server", optional = true } -media = { path = "../media" } - anyhow.workspace = true async-broadcast = "0.4" +async-trait = { workspace = true, optional = true } +collections = { path = "../collections", optional = true } futures.workspace = true +gpui = { path = "../gpui", optional = true } +live_kit_server = { path = "../live_kit_server", optional = true } log.workspace = true +media = { path = "../media" } +nanoid = { version ="0.4", optional = true} parking_lot.workspace = true postage.workspace = true -async-trait = { workspace = true, optional = true } -nanoid = { version ="0.4", optional = true} - [target.'cfg(target_os = "macos")'.dependencies] core-foundation = "0.9.3" @@ -48,21 +46,20 @@ gpui = { path = "../gpui", features = ["test-support"] } live_kit_server = { path = "../live_kit_server" } [dev-dependencies] -collections = { path = "../collections", features = ["test-support"] } -gpui = { path = "../gpui", features = ["test-support"] } -live_kit_server = { path = "../live_kit_server" } -media = { path = "../media" } -nanoid = "0.4" - anyhow.workspace = true async-trait.workspace = true block = "0.1" -bytes = "1.2" byteorder = "1.4" +bytes = "1.2" +collections = { path = "../collections", features = ["test-support"] } foreign-types = "0.3" futures.workspace = true +gpui = { path = "../gpui", features = ["test-support"] } hmac = "0.12" jwt = "0.16" +live_kit_server = { path = "../live_kit_server" } +media = { path = "../media" } +nanoid = "0.4" parking_lot.workspace = true serde.workspace = true serde_derive.workspace = true diff --git a/crates/live_kit_server/Cargo.toml b/crates/live_kit_server/Cargo.toml index 500bd15a95..63b4fe1066 100644 --- a/crates/live_kit_server/Cargo.toml +++ b/crates/live_kit_server/Cargo.toml @@ -15,8 +15,8 @@ anyhow.workspace = true async-trait.workspace = true futures.workspace = true hmac = "0.12" -log.workspace = true jwt = "0.16" +log.workspace = true prost = "0.8" prost-types = "0.8" reqwest = "0.11" diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml index 6ef3b92b8b..f43c8a4bd8 100644 --- a/crates/lsp/Cargo.toml +++ b/crates/lsp/Cargo.toml @@ -13,13 +13,11 @@ doctest = false test-support = ["async-pipe"] [dependencies] -collections = { path = "../collections" } -gpui = { path = "../gpui" } -util = { path = "../util" } - anyhow.workspace = true async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553", optional = true } +collections = { path = "../collections" } futures.workspace = true +gpui = { path = "../gpui" } log.workspace = true lsp-types = { git = "https://github.com/zed-industries/lsp-types", branch = "updated-completion-list-item-defaults" } parking_lot.workspace = true @@ -28,12 +26,12 @@ serde.workspace = true serde_derive.workspace = true serde_json.workspace = true smol.workspace = true +util = { path = "../util" } [dev-dependencies] -gpui = { path = "../gpui", features = ["test-support"] } -util = { path = "../util", features = ["test-support"] } - async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" } ctor.workspace = true env_logger.workspace = true +gpui = { path = "../gpui", features = ["test-support"] } unindent.workspace = true +util = { path = "../util", features = ["test-support"] } diff --git a/crates/media/Cargo.toml b/crates/media/Cargo.toml index 48c50a4fda..351ae37252 100644 --- a/crates/media/Cargo.toml +++ b/crates/media/Cargo.toml @@ -17,8 +17,8 @@ foreign-types = "0.3" [target.'cfg(target_os = "macos")'.dependencies] core-foundation = "0.9.3" -objc = "0.2" metal = "0.21.0" +objc = "0.2" [build-dependencies] bindgen = "0.65.1" diff --git a/crates/multi_buffer/Cargo.toml b/crates/multi_buffer/Cargo.toml index d0be28ba94..87f36f3096 100644 --- a/crates/multi_buffer/Cargo.toml +++ b/crates/multi_buffer/Cargo.toml @@ -21,59 +21,56 @@ test-support = [ ] [dependencies] +aho-corasick = "1.1" +anyhow.workspace = true client = { path = "../client" } clock = { path = "../clock" } collections = { path = "../collections" } -git = { path = "../git" } -gpui = { path = "../gpui" } -language = { path = "../language" } -lsp = { path = "../lsp" } -rich_text = { path = "../rich_text" } -settings = { path = "../settings" } -snippet = { path = "../snippet" } -sum_tree = { path = "../sum_tree" } -text = { path = "../text" } -theme = { path = "../theme" } -util = { path = "../util" } - -aho-corasick = "1.1" -anyhow.workspace = true convert_case = "0.6.0" futures.workspace = true +git = { path = "../git" } +gpui = { path = "../gpui" } indoc = "1.0.4" itertools = "0.10" +language = { path = "../language" } lazy_static.workspace = true log.workspace = true +lsp = { path = "../lsp" } ordered-float.workspace = true parking_lot.workspace = true postage.workspace = true pulldown-cmark = { version = "0.9.2", default-features = false } rand.workspace = true +rich_text = { path = "../rich_text" } schemars.workspace = true serde.workspace = true serde_derive.workspace = true +settings = { path = "../settings" } smallvec.workspace = true smol.workspace = true - -tree-sitter-rust = { workspace = true, optional = true } +snippet = { path = "../snippet" } +sum_tree = { path = "../sum_tree" } +text = { path = "../text" } +theme = { path = "../theme" } tree-sitter-html = { workspace = true, optional = true } +tree-sitter-rust = { workspace = true, optional = true } tree-sitter-typescript = { workspace = true, optional = true } +util = { path = "../util" } [dev-dependencies] copilot = { path = "../copilot", features = ["test-support"] } -text = { path = "../text", features = ["test-support"] } -language = { path = "../language", features = ["test-support"] } -lsp = { path = "../lsp", features = ["test-support"] } -gpui = { path = "../gpui", features = ["test-support"] } -util = { path = "../util", features = ["test-support"] } -project = { path = "../project", features = ["test-support"] } -settings = { path = "../settings", features = ["test-support"] } - ctor.workspace = true env_logger.workspace = true +gpui = { path = "../gpui", features = ["test-support"] } +language = { path = "../language", features = ["test-support"] } +lsp = { path = "../lsp", features = ["test-support"] } +project = { path = "../project", features = ["test-support"] } rand.workspace = true -unindent.workspace = true -tree-sitter.workspace = true -tree-sitter-rust.workspace = true +settings = { path = "../settings", features = ["test-support"] } +text = { path = "../text", features = ["test-support"] } tree-sitter-html.workspace = true +tree-sitter-rust.workspace = true tree-sitter-typescript.workspace = true +tree-sitter.workspace = true +unindent.workspace = true +util = { path = "../util", features = ["test-support"] } diff --git a/crates/node_runtime/Cargo.toml b/crates/node_runtime/Cargo.toml index c174cfa226..b111cf5752 100644 --- a/crates/node_runtime/Cargo.toml +++ b/crates/node_runtime/Cargo.toml @@ -10,15 +10,15 @@ path = "src/node_runtime.rs" doctest = false [dependencies] -util = { path = "../util" } +anyhow.workspace = true async-compression.workspace = true async-tar = "0.4.2" -futures.workspace = true async-trait.workspace = true -anyhow.workspace = true +futures.workspace = true +log.workspace = true parking_lot.workspace = true serde.workspace = true serde_derive.workspace = true serde_json.workspace = true smol.workspace = true -log.workspace = true +util = { path = "../util" } diff --git a/crates/notifications/Cargo.toml b/crates/notifications/Cargo.toml index 5ec2d02417..134bda415b 100644 --- a/crates/notifications/Cargo.toml +++ b/crates/notifications/Cargo.toml @@ -18,6 +18,7 @@ test-support = [ ] [dependencies] +anyhow.workspace = true channel = { path = "../channel" } client = { path = "../client" } clock = { path = "../clock" } @@ -29,10 +30,8 @@ rpc = { path = "../rpc" } settings = { path = "../settings" } sum_tree = { path = "../sum_tree" } text = { path = "../text" } -util = { path = "../util" } - -anyhow.workspace = true time.workspace = true +util = { path = "../util" } [dev-dependencies] client = { path = "../client", features = ["test-support"] } diff --git a/crates/outline/Cargo.toml b/crates/outline/Cargo.toml index 5fa8bbb03a..9dbd540797 100644 --- a/crates/outline/Cargo.toml +++ b/crates/outline/Cargo.toml @@ -13,18 +13,17 @@ doctest = false editor = { path = "../editor" } fuzzy = { path = "../fuzzy" } gpui = { path = "../gpui" } -ui = { path = "../ui" } language = { path = "../language" } +ordered-float.workspace = true picker = { path = "../picker" } +postage.workspace = true settings = { path = "../settings" } +smol.workspace = true text = { path = "../text" } theme = { path = "../theme" } -workspace = { path = "../workspace" } +ui = { path = "../ui" } util = { path = "../util" } - -ordered-float.workspace = true -postage.workspace = true -smol.workspace = true +workspace = { path = "../workspace" } [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } diff --git a/crates/picker/Cargo.toml b/crates/picker/Cargo.toml index bf7cb468ac..c24d037919 100644 --- a/crates/picker/Cargo.toml +++ b/crates/picker/Cargo.toml @@ -11,19 +11,18 @@ doctest = false [dependencies] editor = { path = "../editor" } -ui = { path = "../ui" } gpui = { path = "../gpui" } menu = { path = "../menu" } +parking_lot.workspace = true settings = { path = "../settings" } -util = { path = "../util" } theme = { path = "../theme" } +ui = { path = "../ui" } +util = { path = "../util" } workspace = { path = "../workspace"} -parking_lot.workspace = true - [dev-dependencies] +ctor.workspace = true editor = { path = "../editor", features = ["test-support"] } +env_logger.workspace = true gpui = { path = "../gpui", features = ["test-support"] } serde_json.workspace = true -ctor.workspace = true -env_logger.workspace = true diff --git a/crates/plugin/Cargo.toml b/crates/plugin/Cargo.toml index 1bdd47f594..c07da5d7c7 100644 --- a/crates/plugin/Cargo.toml +++ b/crates/plugin/Cargo.toml @@ -6,7 +6,7 @@ publish = false license = "GPL-3.0-or-later" [dependencies] -serde.workspace = true -serde_derive.workspace = true bincode = "1.3" plugin_macros = { path = "../plugin_macros" } +serde.workspace = true +serde_derive.workspace = true diff --git a/crates/plugin_macros/Cargo.toml b/crates/plugin_macros/Cargo.toml index a125bc67e5..9d940f2423 100644 --- a/crates/plugin_macros/Cargo.toml +++ b/crates/plugin_macros/Cargo.toml @@ -9,9 +9,9 @@ license = "GPL-3.0-or-later" proc-macro = true [dependencies] -syn = { version = "1.0", features = ["full", "extra-traits"] } -quote = "1.0" +bincode = "1.3" proc-macro2 = "1.0" +quote = "1.0" serde.workspace = true serde_derive.workspace = true -bincode = "1.3" +syn = { version = "1.0", features = ["full", "extra-traits"] } diff --git a/crates/plugin_runtime/Cargo.toml b/crates/plugin_runtime/Cargo.toml index f701c893e7..9df33c05b5 100644 --- a/crates/plugin_runtime/Cargo.toml +++ b/crates/plugin_runtime/Cargo.toml @@ -6,16 +6,16 @@ publish = false license = "GPL-3.0-or-later" [dependencies] -wasmtime = "2.0" -wasmtime-wasi = "2.0" -wasi-common = "2.0" anyhow.workspace = true +bincode = "1.3" +pollster = "0.2.5" serde.workspace = true serde_derive.workspace = true serde_json.workspace = true -bincode = "1.3" -pollster = "0.2.5" smol.workspace = true +wasi-common = "2.0" +wasmtime = "2.0" +wasmtime-wasi = "2.0" [build-dependencies] wasmtime = { version = "2.0", features = ["all-arch"] } diff --git a/crates/prettier/Cargo.toml b/crates/prettier/Cargo.toml index be4bb6f2f9..565a43ded7 100644 --- a/crates/prettier/Cargo.toml +++ b/crates/prettier/Cargo.toml @@ -13,24 +13,23 @@ doctest = false test-support = [] [dependencies] +anyhow.workspace = true client = { path = "../client" } -collections = { path = "../collections"} -language = { path = "../language" } -gpui = { path = "../gpui" } +collections = { path = "../collections" } fs = { path = "../fs" } -lsp = { path = "../lsp" } -node_runtime = { path = "../node_runtime"} -util = { path = "../util" } - +futures.workspace = true +gpui = { path = "../gpui" } +language = { path = "../language" } log.workspace = true +lsp = { path = "../lsp" } +node_runtime = { path = "../node_runtime" } +parking_lot.workspace = true serde.workspace = true serde_derive.workspace = true serde_json.workspace = true -anyhow.workspace = true -futures.workspace = true -parking_lot.workspace = true +util = { path = "../util" } [dev-dependencies] -language = { path = "../language", features = ["test-support"] } -gpui = { path = "../gpui", features = ["test-support"] } fs = { path = "../fs", features = ["test-support"] } +gpui = { path = "../gpui", features = ["test-support"] } +language = { path = "../language", features = ["test-support"] } diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml index 453553ed8e..78e9625afb 100644 --- a/crates/project/Cargo.toml +++ b/crates/project/Cargo.toml @@ -21,66 +21,65 @@ test-support = [ ] [dependencies] -text = { path = "../text" } -copilot = { path = "../copilot" } -client = { path = "../client" } -clock = { path = "../clock" } -collections = { path = "../collections" } -db = { path = "../db" } -fs = { path = "../fs" } -fsevent = { path = "../fsevent" } -fuzzy = { path = "../fuzzy" } -git = { path = "../git" } -gpui = { path = "../gpui" } -language = { path = "../language" } -lsp = { path = "../lsp" } -node_runtime = { path = "../node_runtime" } -prettier = { path = "../prettier" } -rpc = { path = "../rpc" } -settings = { path = "../settings" } -sum_tree = { path = "../sum_tree" } -terminal = { path = "../terminal" } -util = { path = "../util" } - aho-corasick = "1.1" anyhow.workspace = true async-trait.workspace = true backtrace = "0.3" +client = { path = "../client" } +clock = { path = "../clock" } +collections = { path = "../collections" } +copilot = { path = "../copilot" } +db = { path = "../db" } +fs = { path = "../fs" } +fsevent = { path = "../fsevent" } futures.workspace = true +fuzzy = { path = "../fuzzy" } +git = { path = "../git" } globset.workspace = true +gpui = { path = "../gpui" } ignore = "0.4" +itertools = "0.10" +language = { path = "../language" } lazy_static.workspace = true log.workspace = true +lsp = { path = "../lsp" } +node_runtime = { path = "../node_runtime" } parking_lot.workspace = true postage.workspace = true +prettier = { path = "../prettier" } rand.workspace = true regex.workspace = true +rpc = { path = "../rpc" } schemars.workspace = true serde.workspace = true serde_derive.workspace = true serde_json.workspace = true +settings = { path = "../settings" } sha2 = "0.10" similar = "1.3" smol.workspace = true +sum_tree = { path = "../sum_tree" } +terminal = { path = "../terminal" } +text = { path = "../text" } thiserror.workspace = true toml.workspace = true -itertools = "0.10" +util = { path = "../util" } [dev-dependencies] -ctor.workspace = true -env_logger.workspace = true -pretty_assertions.workspace = true client = { path = "../client", features = ["test-support"] } collections = { path = "../collections", features = ["test-support"] } +ctor.workspace = true db = { path = "../db", features = ["test-support"] } +env_logger.workspace = true fs = { path = "../fs", features = ["test-support"] } +git2.workspace = true gpui = { path = "../gpui", features = ["test-support"] } language = { path = "../language", features = ["test-support"] } lsp = { path = "../lsp", features = ["test-support"] } -settings = { path = "../settings", features = ["test-support"] } prettier = { path = "../prettier", features = ["test-support"] } -util = { path = "../util", features = ["test-support"] } +pretty_assertions.workspace = true rpc = { path = "../rpc", features = ["test-support"] } -git2.workspace = true +settings = { path = "../settings", features = ["test-support"] } tempfile.workspace = true unindent.workspace = true +util = { path = "../util", features = ["test-support"] } diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml index d7fbb501cb..d681b9b38c 100644 --- a/crates/project_panel/Cargo.toml +++ b/crates/project_panel/Cargo.toml @@ -10,33 +10,33 @@ path = "src/project_panel.rs" doctest = false [dependencies] +anyhow.workspace = true collections = { path = "../collections" } db = { path = "../db" } editor = { path = "../editor" } +futures.workspace = true gpui = { path = "../gpui" } menu = { path = "../menu" } -project = { path = "../project" } -search = { path = "../search" } -settings = { path = "../settings" } -theme = { path = "../theme" } -ui = { path = "../ui" } -util = { path = "../util" } -workspace = { path = "../workspace", package = "workspace" } -anyhow.workspace = true postage.workspace = true -futures.workspace = true +pretty_assertions.workspace = true +project = { path = "../project" } +schemars.workspace = true +search = { path = "../search" } serde.workspace = true serde_derive.workspace = true serde_json.workspace = true -schemars.workspace = true +settings = { path = "../settings" } smallvec.workspace = true -pretty_assertions.workspace = true +theme = { path = "../theme" } +ui = { path = "../ui" } unicase = "2.6" +util = { path = "../util" } +workspace = { path = "../workspace", package = "workspace" } [dev-dependencies] client = { path = "../client", features = ["test-support"] } -language = { path = "../language", features = ["test-support"] } editor = { path = "../editor", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } -workspace = { path = "../workspace", features = ["test-support"] } +language = { path = "../language", features = ["test-support"] } serde_json.workspace = true +workspace = { path = "../workspace", features = ["test-support"] } diff --git a/crates/project_symbols/Cargo.toml b/crates/project_symbols/Cargo.toml index 8f2f8bbf7a..27d36ea99a 100644 --- a/crates/project_symbols/Cargo.toml +++ b/crates/project_symbols/Cargo.toml @@ -10,30 +10,29 @@ path = "src/project_symbols.rs" doctest = false [dependencies] +anyhow.workspace = true editor = { path = "../editor" } fuzzy = { path = "../fuzzy" } gpui = { path = "../gpui" } +ordered-float.workspace = true picker = { path = "../picker" } +postage.workspace = true project = { path = "../project" } -text = { path = "../text" } +serde_json.workspace = true settings = { path = "../settings" } -workspace = { path = "../workspace" } +smol.workspace = true +text = { path = "../text" } theme = { path = "../theme" } util = { path = "../util" } - -anyhow.workspace = true -ordered-float.workspace = true -postage.workspace = true -smol.workspace = true -serde_json.workspace = true +workspace = { path = "../workspace" } [dev-dependencies] -futures.workspace = true editor = { path = "../editor", features = ["test-support"] } -settings = { path = "../settings", features = ["test-support"] } +futures.workspace = true gpui = { path = "../gpui", features = ["test-support"] } language = { path = "../language", features = ["test-support"] } lsp = { path = "../lsp", features = ["test-support"] } project = { path = "../project", features = ["test-support"] } +settings = { path = "../settings", features = ["test-support"] } theme = { path = "../theme", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] } diff --git a/crates/quick_action_bar/Cargo.toml b/crates/quick_action_bar/Cargo.toml index e57bd07502..56c92be8a1 100644 --- a/crates/quick_action_bar/Cargo.toml +++ b/crates/quick_action_bar/Cargo.toml @@ -14,8 +14,8 @@ assistant = { path = "../assistant" } editor = { path = "../editor" } gpui = { path = "../gpui" } search = { path = "../search" } -workspace = { path = "../workspace" } ui = { path = "../ui" } +workspace = { path = "../workspace" } [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } diff --git a/crates/recent_projects/Cargo.toml b/crates/recent_projects/Cargo.toml index 62a4754eff..ee4e4498fd 100644 --- a/crates/recent_projects/Cargo.toml +++ b/crates/recent_projects/Cargo.toml @@ -11,21 +11,20 @@ doctest = false [dependencies] editor = { path = "../editor" } +futures.workspace = true fuzzy = { path = "../fuzzy" } gpui = { path = "../gpui" } language = { path = "../language" } +ordered-float.workspace = true picker = { path = "../picker" } +postage.workspace = true settings = { path = "../settings" } +smol.workspace = true text = { path = "../text" } -util = { path = "../util"} theme = { path = "../theme" } ui = { path = "../ui" } +util = { path = "../util"} workspace = { path = "../workspace" } -futures.workspace = true -ordered-float.workspace = true -postage.workspace = true -smol.workspace = true - [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } diff --git a/crates/refineable/Cargo.toml b/crates/refineable/Cargo.toml index e586f0fc6a..cc1b5d0344 100644 --- a/crates/refineable/Cargo.toml +++ b/crates/refineable/Cargo.toml @@ -10,7 +10,7 @@ path = "src/refineable.rs" doctest = false [dependencies] -syn = "1.0.72" -quote = "1.0.9" -proc-macro2 = "1.0.66" derive_refineable = { path = "./derive_refineable" } +proc-macro2 = "1.0.66" +quote = "1.0.9" +syn = "1.0.72" diff --git a/crates/rich_text/Cargo.toml b/crates/rich_text/Cargo.toml index cb8478e36d..a772407a83 100644 --- a/crates/rich_text/Cargo.toml +++ b/crates/rich_text/Cargo.toml @@ -16,16 +16,16 @@ test-support = [ ] [dependencies] -collections = { path = "../collections" } -gpui = { path = "../gpui" } -sum_tree = { path = "../sum_tree" } -theme = { path = "../theme" } -language = { path = "../language" } -util = { path = "../util" } -ui = { path = "../ui" } anyhow.workspace = true +collections = { path = "../collections" } futures.workspace = true +gpui = { path = "../gpui" } +language = { path = "../language" } lazy_static.workspace = true pulldown-cmark = { version = "0.9.2", default-features = false } smallvec.workspace = true smol.workspace = true +sum_tree = { path = "../sum_tree" } +theme = { path = "../theme" } +ui = { path = "../ui" } +util = { path = "../util" } diff --git a/crates/rope/Cargo.toml b/crates/rope/Cargo.toml index 4839bceb64..60d6e8f40b 100644 --- a/crates/rope/Cargo.toml +++ b/crates/rope/Cargo.toml @@ -9,14 +9,14 @@ license = "GPL-3.0-or-later" path = "src/rope.rs" [dependencies] +arrayvec = "0.7.1" bromberg_sl2 = { git = "https://github.com/zed-industries/bromberg_sl2", rev = "950bc5482c216c395049ae33ae4501e08975f17f" } +log.workspace = true smallvec.workspace = true sum_tree = { path = "../sum_tree" } -arrayvec = "0.7.1" -log.workspace = true util = { path = "../util" } [dev-dependencies] +gpui = { path = "../gpui", features = ["test-support"] } rand.workspace = true util = { path = "../util", features = ["test-support"] } -gpui = { path = "../gpui", features = ["test-support"] } diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml index e4bca184ee..fe213be68c 100644 --- a/crates/rpc/Cargo.toml +++ b/crates/rpc/Cargo.toml @@ -14,25 +14,25 @@ doctest = false test-support = ["collections/test-support", "gpui/test-support"] [dependencies] -clock = { path = "../clock" } -collections = { path = "../collections" } -gpui = { path = "../gpui", optional = true } -util = { path = "../util" } anyhow.workspace = true async-lock = "2.4" async-tungstenite = "0.16" base64 = "0.13" +clock = { path = "../clock" } +collections = { path = "../collections" } futures.workspace = true +gpui = { path = "../gpui", optional = true } parking_lot.workspace = true prost.workspace = true rand.workspace = true rsa = "0.4" -serde_json.workspace = true serde.workspace = true serde_derive.workspace = true +serde_json.workspace = true smol-timeout = "0.6" strum.workspace = true tracing = { version = "0.1.34", features = ["log"] } +util = { path = "../util" } zstd = "0.11" [build-dependencies] @@ -40,8 +40,8 @@ prost-build = "0.9" [dev-dependencies] collections = { path = "../collections", features = ["test-support"] } +ctor.workspace = true +env_logger.workspace = true gpui = { path = "../gpui", features = ["test-support"] } smol.workspace = true tempfile.workspace = true -ctor.workspace = true -env_logger.workspace = true diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml index 42ac3ab8e1..6388ad062b 100644 --- a/crates/search/Cargo.toml +++ b/crates/search/Cargo.toml @@ -10,32 +10,32 @@ path = "src/search.rs" doctest = false [dependencies] +anyhow.workspace = true bitflags = "1" collections = { path = "../collections" } editor = { path = "../editor" } +futures.workspace = true gpui = { path = "../gpui" } language = { path = "../language" } -menu = { path = "../menu" } -project = { path = "../project" } -settings = { path = "../settings" } -theme = { path = "../theme" } -util = { path = "../util" } -ui = {path = "../ui"} -workspace = { path = "../workspace" } -semantic_index = { path = "../semantic_index" } -anyhow.workspace = true -futures.workspace = true log.workspace = true +menu = { path = "../menu" } postage.workspace = true +project = { path = "../project" } +semantic_index = { path = "../semantic_index" } serde.workspace = true serde_derive.workspace = true +serde_json.workspace = true +settings = { path = "../settings" } smallvec.workspace = true smol.workspace = true -serde_json.workspace = true +theme = { path = "../theme" } +ui = {path = "../ui"} +util = { path = "../util" } +workspace = { path = "../workspace" } + [dev-dependencies] client = { path = "../client", features = ["test-support"] } editor = { path = "../editor", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } - -workspace = { path = "../workspace", features = ["test-support"] } unindent.workspace = true +workspace = { path = "../workspace", features = ["test-support"] } diff --git a/crates/semantic_index/Cargo.toml b/crates/semantic_index/Cargo.toml index 274b603313..a49145f0a0 100644 --- a/crates/semantic_index/Cargo.toml +++ b/crates/semantic_index/Cargo.toml @@ -11,61 +11,59 @@ doctest = false [dependencies] ai = { path = "../ai" } +anyhow.workspace = true +async-trait.workspace = true collections = { path = "../collections" } +futures.workspace = true +globset.workspace = true gpui = { path = "../gpui" } language = { path = "../language" } +lazy_static.workspace = true +log.workspace = true +ndarray = { version = "0.15.0" } +ordered-float.workspace = true +parking_lot.workspace = true +postage.workspace = true project = { path = "../project" } -workspace = { path = "../workspace" } -util = { path = "../util" } +rand.workspace = true release_channel = { path = "../release_channel" } rpc = { path = "../rpc" } -settings = { path = "../settings" } -anyhow.workspace = true -postage.workspace = true -futures.workspace = true -ordered-float.workspace = true -smol.workspace = true rusqlite.workspace = true -log.workspace = true -tree-sitter.workspace = true -lazy_static.workspace = true +schemars.workspace = true serde.workspace = true serde_json.workspace = true -async-trait.workspace = true -tiktoken-rs.workspace = true -parking_lot.workspace = true -rand.workspace = true -schemars.workspace = true -globset.workspace = true +settings = { path = "../settings" } sha1 = "0.10.5" -ndarray = { version = "0.15.0" } +smol.workspace = true +tiktoken-rs.workspace = true +tree-sitter.workspace = true +util = { path = "../util" } +workspace = { path = "../workspace" } [dev-dependencies] ai = { path = "../ai", features = ["test-support"] } -collections = { path = "../collections", features = ["test-support"] } -gpui = { path = "../gpui", features = ["test-support"] } -language = { path = "../language", features = ["test-support"] } -project = { path = "../project", features = ["test-support"] } -rpc = { path = "../rpc", features = ["test-support"] } -workspace = { path = "../workspace", features = ["test-support"] } -settings = { path = "../settings", features = ["test-support"]} -rust-embed.workspace = true client = { path = "../client" } -node_runtime = { path = "../node_runtime"} - -pretty_assertions.workspace = true -rand.workspace = true -unindent.workspace = true -tempfile.workspace = true +collections = { path = "../collections", features = ["test-support"] } ctor.workspace = true env_logger.workspace = true - -tree-sitter-typescript.workspace = true -tree-sitter-json.workspace = true -tree-sitter-rust.workspace = true -tree-sitter-toml.workspace = true +gpui = { path = "../gpui", features = ["test-support"] } +language = { path = "../language", features = ["test-support"] } +node_runtime = { path = "../node_runtime"} +pretty_assertions.workspace = true +project = { path = "../project", features = ["test-support"] } +rand.workspace = true +rpc = { path = "../rpc", features = ["test-support"] } +rust-embed.workspace = true +settings = { path = "../settings", features = ["test-support"]} +tempfile.workspace = true tree-sitter-cpp.workspace = true tree-sitter-elixir.workspace = true +tree-sitter-json.workspace = true tree-sitter-lua.workspace = true -tree-sitter-ruby.workspace = true tree-sitter-php.workspace = true +tree-sitter-ruby.workspace = true +tree-sitter-rust.workspace = true +tree-sitter-toml.workspace = true +tree-sitter-typescript.workspace = true +unindent.workspace = true +workspace = { path = "../workspace", features = ["test-support"] } diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml index cd6af095e7..5e93189a23 100644 --- a/crates/settings/Cargo.toml +++ b/crates/settings/Cargo.toml @@ -13,31 +13,30 @@ doctest = false test-support = ["gpui/test-support", "fs/test-support"] [dependencies] -collections = { path = "../collections" } -gpui = { path = "../gpui" } -fs = { path = "../fs" } -feature_flags = { path = "../feature_flags" } -release_channel = { path = "../release_channel" } -util = { path = "../util" } - anyhow.workspace = true +collections = { path = "../collections" } +feature_flags = { path = "../feature_flags" } +fs = { path = "../fs" } futures.workspace = true -serde_json_lenient = {version = "0.1", features = ["preserve_order", "raw_value"]} +gpui = { path = "../gpui" } lazy_static.workspace = true postage.workspace = true +release_channel = { path = "../release_channel" } rust-embed.workspace = true schemars.workspace = true serde.workspace = true serde_derive.workspace = true serde_json.workspace = true +serde_json_lenient = {version = "0.1", features = ["preserve_order", "raw_value"] } smallvec.workspace = true toml.workspace = true -tree-sitter.workspace = true tree-sitter-json = "*" +tree-sitter.workspace = true +util = { path = "../util" } [dev-dependencies] -gpui = { path = "../gpui", features = ["test-support"] } fs = { path = "../fs", features = ["test-support"] } +gpui = { path = "../gpui", features = ["test-support"] } indoc.workspace = true pretty_assertions.workspace = true unindent.workspace = true diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml index 6a3006f794..0d5f9dba54 100644 --- a/crates/sqlez/Cargo.toml +++ b/crates/sqlez/Cargo.toml @@ -7,12 +7,12 @@ license = "GPL-3.0-or-later" [dependencies] anyhow.workspace = true +futures.workspace = true indoc.workspace = true +lazy_static.workspace = true libsqlite3-sys = { version = "0.26", features = ["bundled"] } +parking_lot.workspace = true smol.workspace = true thread_local = "1.1.4" -lazy_static.workspace = true -parking_lot.workspace = true -futures.workspace = true util = { path = "../util" } uuid.workspace = true diff --git a/crates/sqlez_macros/Cargo.toml b/crates/sqlez_macros/Cargo.toml index bfb234ba4a..a6e3881b7f 100644 --- a/crates/sqlez_macros/Cargo.toml +++ b/crates/sqlez_macros/Cargo.toml @@ -11,9 +11,9 @@ proc-macro = true doctest = false [dependencies] -syn = "1.0" -quote = "1.0" -proc-macro2 = "1.0" lazy_static.workspace = true +proc-macro2 = "1.0" +quote = "1.0" sqlez = { path = "../sqlez" } sqlformat = "0.2" +syn = "1.0" diff --git a/crates/story/Cargo.toml b/crates/story/Cargo.toml index 47117a38be..9b17a04096 100644 --- a/crates/story/Cargo.toml +++ b/crates/story/Cargo.toml @@ -7,5 +7,5 @@ license = "GPL-3.0-or-later" [dependencies] gpui = { path = "../gpui" } +itertools = { package = "itertools", version = "0.10" } smallvec.workspace = true -itertools = {package = "itertools", version = "0.10"} diff --git a/crates/storybook/Cargo.toml b/crates/storybook/Cargo.toml index 241fc5f4a8..6177609d94 100644 --- a/crates/storybook/Cargo.toml +++ b/crates/storybook/Cargo.toml @@ -16,7 +16,7 @@ backtrace-on-stack-overflow = "0.3.0" chrono = "0.4" clap = { version = "4.4", features = ["derive", "string"] } collab_ui = { path = "../collab_ui", features = ["stories"] } -strum = { version = "0.25.0", features = ["derive"] } +ctrlc = "3.4" dialoguer = { version = "0.11.0", features = ["fuzzy-select"] } editor = { path = "../editor" } fuzzy = { path = "../fuzzy" } @@ -25,18 +25,18 @@ indoc.workspace = true itertools = "0.11.0" language = { path = "../language" } log.workspace = true +menu = { path = "../menu" } +picker = { path = "../picker" } rust-embed.workspace = true serde.workspace = true 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" } -ctrlc = "3.4" [dev-dependencies] gpui = { path = "../gpui", features = ["test-support"] } diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml index 44be85e436..baad46b261 100644 --- a/crates/terminal/Cargo.toml +++ b/crates/terminal/Cargo.toml @@ -11,30 +11,29 @@ doctest = false [dependencies] -gpui = { path = "../gpui" } -settings = { path = "../settings" } -db = { path = "../db" } -theme = { path = "../theme" } -util = { path = "../util" } - alacritty_terminal = "0.21" -procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f2eb039ed0c6bb6512223e69d5efc64d", default-features = false } -smallvec.workspace = true -smol.workspace = true -mio-extras = "2.0.6" -futures.workspace = true -ordered-float.workspace = true -itertools = "0.10" -dirs = "4.0.0" -shellexpand = "2.1.0" -libc = "0.2" anyhow.workspace = true -schemars.workspace = true -thiserror.workspace = true +db = { path = "../db" } +dirs = "4.0.0" +futures.workspace = true +gpui = { path = "../gpui" } +itertools = "0.10" lazy_static.workspace = true +libc = "0.2" +mio-extras = "2.0.6" +ordered-float.workspace = true +procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f2eb039ed0c6bb6512223e69d5efc64d", default-features = false } +schemars.workspace = true serde.workspace = true serde_derive.workspace = true serde_json.workspace = true +settings = { path = "../settings" } +shellexpand = "2.1.0" +smallvec.workspace = true +smol.workspace = true +theme = { path = "../theme" } +thiserror.workspace = true +util = { path = "../util" } [dev-dependencies] rand.workspace = true diff --git a/crates/terminal_view/Cargo.toml b/crates/terminal_view/Cargo.toml index 664397a0a3..dfffe3824f 100644 --- a/crates/terminal_view/Cargo.toml +++ b/crates/terminal_view/Cargo.toml @@ -10,39 +10,39 @@ path = "src/terminal_view.rs" doctest = false [dependencies] +anyhow.workspace = true +db = { path = "../db" } +dirs = "4.0.0" editor = { path = "../editor" } -language = { path = "../language" } +futures.workspace = true gpui = { path = "../gpui" } +itertools = "0.10" +language = { path = "../language" } +lazy_static.workspace = true +libc = "0.2" +mio-extras = "2.0.6" +ordered-float.workspace = true +procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f2eb039ed0c6bb6512223e69d5efc64d", default-features = false } project = { path = "../project" } search = { path = "../search" } -settings = { path = "../settings" } -theme = { path = "../theme" } -util = { path = "../util" } -workspace = { path = "../workspace" } -db = { path = "../db" } -procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f2eb039ed0c6bb6512223e69d5efc64d", default-features = false } -terminal = { path = "../terminal" } -ui = { path = "../ui" } -smallvec.workspace = true -smol.workspace = true -mio-extras = "2.0.6" -futures.workspace = true -ordered-float.workspace = true -itertools = "0.10" -dirs = "4.0.0" -shellexpand = "2.1.0" -libc = "0.2" -anyhow.workspace = true -thiserror.workspace = true -lazy_static.workspace = true serde.workspace = true serde_derive.workspace = true serde_json.workspace = true +settings = { path = "../settings" } +shellexpand = "2.1.0" +smallvec.workspace = true +smol.workspace = true +terminal = { path = "../terminal" } +theme = { path = "../theme" } +thiserror.workspace = true +ui = { path = "../ui" } +util = { path = "../util" } +workspace = { path = "../workspace" } [dev-dependencies] +client = { path = "../client", features = ["test-support"] } editor = { path = "../editor", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } -client = { path = "../client", features = ["test-support"]} -project = { path = "../project", features = ["test-support"]} -workspace = { path = "../workspace", features = ["test-support"] } +project = { path = "../project", features = ["test-support"] } rand.workspace = true +workspace = { path = "../workspace", features = ["test-support"] } diff --git a/crates/text/Cargo.toml b/crates/text/Cargo.toml index 3bbcb7fab5..e3cf4b0238 100644 --- a/crates/text/Cargo.toml +++ b/crates/text/Cargo.toml @@ -13,26 +13,25 @@ doctest = false test-support = ["rand"] [dependencies] +anyhow.workspace = true clock = { path = "../clock" } collections = { path = "../collections" } -rope = { path = "../rope" } -sum_tree = { path = "../sum_tree" } -util = { path = "../util" } - -anyhow.workspace = true digest = { version = "0.9", features = ["std"] } lazy_static.workspace = true log.workspace = true parking_lot.workspace = true postage.workspace = true rand = { workspace = true, optional = true } -smallvec.workspace = true regex.workspace = true +rope = { path = "../rope" } +smallvec.workspace = true +sum_tree = { path = "../sum_tree" } +util = { path = "../util" } [dev-dependencies] collections = { path = "../collections", features = ["test-support"] } -gpui = { path = "../gpui", features = ["test-support"] } -util = { path = "../util", features = ["test-support"] } ctor.workspace = true env_logger.workspace = true +gpui = { path = "../gpui", features = ["test-support"] } rand.workspace = true +util = { path = "../util", features = ["test-support"] } diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml index d854a32497..81ae89a268 100644 --- a/crates/theme/Cargo.toml +++ b/crates/theme/Cargo.toml @@ -20,11 +20,13 @@ doctest = false [dependencies] anyhow.workspace = true +color = {path = "../color"} derive_more.workspace = true fs = { path = "../fs" } futures.workspace = true gpui = { path = "../gpui" } indexmap = { version = "1.6.2", features = ["serde"] } +itertools = { version = "0.11.0", optional = true } palette = { version = "0.7.3", default-features = false, features = ["std"] } parking_lot.workspace = true refineable.workspace = true @@ -36,12 +38,10 @@ serde_repr.workspace = true settings = { path = "../settings" } story = { path = "../story", optional = true } toml.workspace = true -uuid.workspace = true util = { path = "../util" } -color = {path = "../color"} -itertools = { version = "0.11.0", optional = true } +uuid.workspace = true [dev-dependencies] -gpui = { path = "../gpui", features = ["test-support"] } fs = { path = "../fs", features = ["test-support"] } +gpui = { path = "../gpui", features = ["test-support"] } settings = { path = "../settings", features = ["test-support"] } diff --git a/crates/theme_selector/Cargo.toml b/crates/theme_selector/Cargo.toml index d24039b84c..b3727092ea 100644 --- a/crates/theme_selector/Cargo.toml +++ b/crates/theme_selector/Cargo.toml @@ -16,16 +16,16 @@ feature_flags = { path = "../feature_flags" } fs = { path = "../fs" } fuzzy = { path = "../fuzzy" } gpui = { path = "../gpui" } +log.workspace = true +parking_lot.workspace = true picker = { path = "../picker" } +postage.workspace = true settings = { path = "../settings" } +smol.workspace = true theme = { path = "../theme" } ui = { path = "../ui" } util = { path = "../util" } workspace = { path = "../workspace" } -log.workspace = true -parking_lot.workspace = true -postage.workspace = true -smol.workspace = true [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml index 7eb6ca3a12..0c5316e594 100644 --- a/crates/ui/Cargo.toml +++ b/crates/ui/Cargo.toml @@ -15,13 +15,13 @@ chrono = "0.4" gpui = { path = "../gpui" } itertools = { version = "0.11.0", optional = true } menu = { path = "../menu"} +rand = "0.8" serde.workspace = true settings = { path = "../settings" } smallvec.workspace = true story = { path = "../story", optional = true } strum = { version = "0.25.0", features = ["derive"] } theme = { path = "../theme" } -rand = "0.8" [features] default = [] diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml index a1045f8f82..c510d6f557 100644 --- a/crates/util/Cargo.toml +++ b/crates/util/Cargo.toml @@ -15,26 +15,26 @@ test-support = ["tempfile", "git2"] [dependencies] anyhow.workspace = true backtrace = "0.3" -globset.workspace = true -log.workspace = true -lazy_static.workspace = true +dirs = "3.0" futures.workspace = true +git2 = { workspace = true, optional = true } +globset.workspace = true isahc.workspace = true -smol.workspace = true -url.workspace = true +lazy_static.workspace = true +log.workspace = true +parking_lot.workspace = true rand.workspace = true rust-embed.workspace = true -tempfile = { workspace = true, optional = true } serde.workspace = true serde_json.workspace = true -git2 = { workspace = true, optional = true } -dirs = "3.0" +smol.workspace = true take-until = "0.2.0" -parking_lot.workspace = true +tempfile = { workspace = true, optional = true } +url.workspace = true [target.'cfg(windows)'.dependencies] tendril = "0.4.3" [dev-dependencies] -tempfile.workspace = true git2.workspace = true +tempfile.workspace = true diff --git a/crates/vcs_menu/Cargo.toml b/crates/vcs_menu/Cargo.toml index 7333cae93f..88cbbb0a84 100644 --- a/crates/vcs_menu/Cargo.toml +++ b/crates/vcs_menu/Cargo.toml @@ -6,12 +6,11 @@ publish = false license = "GPL-3.0-or-later" [dependencies] -fuzzy = { path = "../fuzzy"} -fs = {path = "../fs"} -gpui = {path = "../gpui"} -picker = {path = "../picker"} -util = {path = "../util"} -ui = {path = "../ui"} -workspace = { path = "../workspace" } - anyhow.workspace = true +fs = { path = "../fs" } +fuzzy = { path = "../fuzzy" } +gpui = { path = "../gpui" } +picker = { path = "../picker" } +ui = { path = "../ui" } +util = { path = "../util" } +workspace = { path = "../workspace" } diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml index 6207630f8f..13c0b7bd45 100644 --- a/crates/vim/Cargo.toml +++ b/crates/vim/Cargo.toml @@ -14,44 +14,41 @@ neovim = ["nvim-rs", "async-compat", "async-trait", "tokio"] [dependencies] anyhow.workspace = true -serde.workspace = true -serde_derive.workspace = true -itertools = "0.10" -log.workspace = true - async-compat = { version = "0.2.1", "optional" = true } async-trait = { workspace = true, "optional" = true } -nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", branch = "master", features = ["use_tokio"], optional = true } -tokio = { version = "1.15", "optional" = true } -serde_json.workspace = true -regex.workspace = true - collections = { path = "../collections" } command_palette = { path = "../command_palette" } # HACK: We're only depending on `copilot` here for `CommandPaletteFilter`. See the attached comment on that type. copilot = { path = "../copilot" } +diagnostics = { path = "../diagnostics" } editor = { path = "../editor" } gpui = { path = "../gpui" } +itertools = "0.10" language = { path = "../language" } +log.workspace = true +nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", branch = "master", features = ["use_tokio"], optional = true } +regex.workspace = true search = { path = "../search" } +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true settings = { path = "../settings" } -workspace = { path = "../workspace" } theme = { path = "../theme" } +tokio = { version = "1.15", "optional" = true } ui = { path = "../ui"} -diagnostics = { path = "../diagnostics" } +workspace = { path = "../workspace" } zed_actions = { path = "../zed_actions" } [dev-dependencies] -indoc.workspace = true -parking_lot.workspace = true -futures.workspace = true - editor = { path = "../editor", features = ["test-support"] } +futures.workspace = true gpui = { path = "../gpui", features = ["test-support"] } +indoc.workspace = true language = { path = "../language", features = ["test-support"] } -project = { path = "../project", features = ["test-support"] } -util = { path = "../util", features = ["test-support"] } -settings = { path = "../settings" } -workspace = { path = "../workspace", features = ["test-support"] } -theme = { path = "../theme", features = ["test-support"] } lsp = { path = "../lsp", features = ["test-support"] } +parking_lot.workspace = true +project = { path = "../project", features = ["test-support"] } +settings = { path = "../settings" } +theme = { path = "../theme", features = ["test-support"] } +util = { path = "../util", features = ["test-support"] } +workspace = { path = "../workspace", features = ["test-support"] } diff --git a/crates/welcome/Cargo.toml b/crates/welcome/Cargo.toml index 9dfce5888d..e915581f64 100644 --- a/crates/welcome/Cargo.toml +++ b/crates/welcome/Cargo.toml @@ -12,27 +12,26 @@ path = "src/welcome.rs" test-support = [] [dependencies] +anyhow.workspace = true client = { path = "../client" } +db = { path = "../db" } editor = { path = "../editor" } fs = { path = "../fs" } fuzzy = { path = "../fuzzy" } gpui = { path = "../gpui" } -ui = { path = "../ui" } -db = { path = "../db" } install_cli = { path = "../install_cli" } +log.workspace = true +picker = { path = "../picker" } project = { path = "../project" } +schemars.workspace = true +serde.workspace = true settings = { path = "../settings" } theme = { path = "../theme" } theme_selector = { path = "../theme_selector" } +ui = { path = "../ui" } util = { path = "../util" } -picker = { path = "../picker" } -workspace = { path = "../workspace" } vim = { path = "../vim" } - -anyhow.workspace = true -log.workspace = true -schemars.workspace = true -serde.workspace = true +workspace = { path = "../workspace" } [dev-dependencies] editor = { path = "../editor", features = ["test-support"] } diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml index 7693ce0509..bbba42e9af 100644 --- a/crates/workspace/Cargo.toml +++ b/crates/workspace/Cargo.toml @@ -20,50 +20,46 @@ test-support = [ ] [dependencies] -db = { path = "../db" } +anyhow.workspace = true +async-recursion = "1.0.0" +bincode = "1.2.1" call = { path = "../call" } client = { path = "../client" } collections = { path = "../collections" } -# context_menu = { path = "../context_menu" } +db = { path = "../db" } +derive_more.workspace = true fs = { path = "../fs" } +futures.workspace = true gpui = { path = "../gpui" } install_cli = { path = "../install_cli" } -language = { path = "../language" } -#menu = { path = "../menu" } -node_runtime = { path = "../node_runtime" } -project = { path = "../project" } -settings = { path = "../settings" } -sqlez = { path = "../sqlez" } -terminal = { path = "../terminal" } -theme = { path = "../theme" } -util = { path = "../util" } -ui = { path = "../ui" } - -async-recursion = "1.0.0" itertools = "0.10" -bincode = "1.2.1" -anyhow.workspace = true -derive_more.workspace = true -futures.workspace = true +language = { path = "../language" } lazy_static.workspace = true log.workspace = true +node_runtime = { path = "../node_runtime" } parking_lot.workspace = true postage.workspace = true +project = { path = "../project" } schemars.workspace = true serde.workspace = true serde_derive.workspace = true serde_json.workspace = true +settings = { path = "../settings" } smallvec.workspace = true +sqlez = { path = "../sqlez" } +terminal = { path = "../terminal" } +theme = { path = "../theme" } +ui = { path = "../ui" } +util = { path = "../util" } uuid.workspace = true [dev-dependencies] call = { path = "../call", features = ["test-support"] } client = { path = "../client", features = ["test-support"] } +db = { path = "../db", features = ["test-support"] } +env_logger.workspace = true +fs = { path = "../fs", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } +indoc.workspace = true project = { path = "../project", features = ["test-support"] } settings = { path = "../settings", features = ["test-support"] } -fs = { path = "../fs", features = ["test-support"] } -db = { path = "../db", features = ["test-support"] } - -indoc.workspace = true -env_logger.workspace = true diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index 3741efbad0..c930c2eeb1 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -16,156 +16,147 @@ name = "Zed" path = "src/main.rs" [dependencies] -ai = { path = "../ai"} +activity_indicator = { path = "../activity_indicator" } +ai = { path = "../ai" } +anyhow.workspace = true +assets = { path = "../assets" } +assistant = { path = "../assistant" } +async-compression.workspace = true +async-recursion = "0.3" +async-tar = "0.4.2" +async-trait.workspace = true audio = { path = "../audio" } -activity_indicator = { path = "../activity_indicator"} auto_update = { path = "../auto_update" } +backtrace = "0.3" breadcrumbs = { path = "../breadcrumbs" } call = { path = "../call" } channel = { path = "../channel" } +chrono = "0.4" cli = { path = "../cli" } +client = { path = "../client" } collab_ui = { path = "../collab_ui" } collections = { path = "../collections" } command_palette = { path = "../command_palette" } -# component_test = { path = "../component_test" } -client = { path = "../client" } -# clock = { path = "../clock" } copilot = { path = "../copilot" } copilot_ui = { path = "../copilot_ui" } -diagnostics = { path = "../diagnostics" } +ctor.workspace = true db = { path = "../db" } +diagnostics = { path = "../diagnostics" } editor = { path = "../editor" } +env_logger.workspace = true +feature_flags = { path = "../feature_flags" } feedback = { path = "../feedback" } file_finder = { path = "../file_finder" } -search = { path = "../search" } fs = { path = "../fs" } fsevent = { path = "../fsevent" } +futures.workspace = true go_to_line = { path = "../go_to_line" } gpui = { path = "../gpui" } +ignore = "0.4" +image = "0.23" +indexmap = "1.6.2" install_cli = { path = "../install_cli" } +isahc.workspace = true journal = { path = "../journal" } language = { path = "../language" } language_selector = { path = "../language_selector" } +language_tools = { path = "../language_tools" } +lazy_static.workspace = true +libc = "0.2" +log.workspace = true lsp = { path = "../lsp" } menu = { path = "../menu" } -language_tools = { path = "../language_tools" } node_runtime = { path = "../node_runtime" } notifications = { path = "../notifications" } -assistant = { path = "../assistant" } +num_cpus = "1.13.0" outline = { path = "../outline" } -# plugin_runtime = { path = "../plugin_runtime",optional = true } +parking_lot.workspace = true +postage.workspace = true project = { path = "../project" } project_panel = { path = "../project_panel" } project_symbols = { path = "../project_symbols" } quick_action_bar = { path = "../quick_action_bar" } -recent_projects = { path = "../recent_projects" } -release_channel = { path = "../release_channel" } -rope = { path = "../rope"} -rpc = { path = "../rpc" } -settings = { path = "../settings" } -feature_flags = { path = "../feature_flags" } -sum_tree = { path = "../sum_tree" } -shellexpand = "2.1.0" -text = { path = "../text" } -terminal_view = { path = "../terminal_view" } -theme = { path = "../theme" } -theme_selector = { path = "../theme_selector" } -util = { path = "../util" } -semantic_index = { path = "../semantic_index" } -vim = { path = "../vim" } -workspace = { path = "../workspace" } -welcome = { path = "../welcome" } -zed_actions = {path = "../zed_actions"} -assets = {path = "../assets"} -anyhow.workspace = true -async-compression.workspace = true -async-tar = "0.4.2" -async-recursion = "0.3" -async-trait.workspace = true -backtrace = "0.3" -chrono = "0.4" -ctor.workspace = true -env_logger.workspace = true -futures.workspace = true -ignore = "0.4" -image = "0.23" -indexmap = "1.6.2" -isahc.workspace = true -lazy_static.workspace = true -libc = "0.2" -log.workspace = true -num_cpus = "1.13.0" -parking_lot.workspace = true -postage.workspace = true rand.workspace = true +recent_projects = { path = "../recent_projects" } regex.workspace = true +release_channel = { path = "../release_channel" } +rope = { path = "../rope" } +rpc = { path = "../rpc" } rsa = "0.4" rust-embed.workspace = true +schemars.workspace = true +search = { path = "../search" } +semantic_index = { path = "../semantic_index" } serde.workspace = true serde_derive.workspace = true serde_json.workspace = true -schemars.workspace = true +settings = { path = "../settings" } +shellexpand = "2.1.0" simplelog = "0.9" smallvec.workspace = true smol.workspace = true +sum_tree = { path = "../sum_tree" } tempfile.workspace = true +terminal_view = { path = "../terminal_view" } +text = { path = "../text" } +theme = { path = "../theme" } +theme_selector = { path = "../theme_selector" } thiserror.workspace = true tiny_http = "0.8" toml.workspace = true -tree-sitter.workspace = true tree-sitter-bash.workspace = true +tree-sitter-c-sharp.workspace = true tree-sitter-c.workspace = true tree-sitter-cpp.workspace = true -tree-sitter-c-sharp.workspace = true tree-sitter-css.workspace = true tree-sitter-elixir.workspace = true tree-sitter-elm.workspace = true tree-sitter-embedded-template.workspace = true -tree-sitter-glsl.workspace = true tree-sitter-gleam.workspace = true +tree-sitter-glsl.workspace = true tree-sitter-go.workspace = true -tree-sitter-heex.workspace = true -tree-sitter-json.workspace = true -tree-sitter-rust.workspace = true -tree-sitter-markdown.workspace = true -tree-sitter-proto.workspace = true -tree-sitter-python.workspace = true -tree-sitter-toml.workspace = true -tree-sitter-typescript.workspace = true -tree-sitter-ruby.workspace = true tree-sitter-haskell.workspace = true +tree-sitter-heex.workspace = true tree-sitter-html.workspace = true -tree-sitter-php.workspace = true -tree-sitter-purescript.workspace = true -tree-sitter-scheme.workspace = true -tree-sitter-svelte.workspace = true -tree-sitter-racket.workspace = true -tree-sitter-yaml.workspace = true +tree-sitter-json.workspace = true tree-sitter-lua.workspace = true +tree-sitter-markdown.workspace = true tree-sitter-nix.workspace = true tree-sitter-nu.workspace = true -tree-sitter-vue.workspace = true +tree-sitter-php.workspace = true +tree-sitter-proto.workspace = true +tree-sitter-purescript.workspace = true +tree-sitter-python.workspace = true +tree-sitter-racket.workspace = true +tree-sitter-ruby.workspace = true +tree-sitter-rust.workspace = true +tree-sitter-scheme.workspace = true +tree-sitter-svelte.workspace = true +tree-sitter-toml.workspace = true +tree-sitter-typescript.workspace = true tree-sitter-uiua.workspace = true +tree-sitter-vue.workspace = true +tree-sitter-yaml.workspace = true tree-sitter-zig.workspace = true - +tree-sitter.workspace = true url.workspace = true urlencoding = "2.1.2" +util = { path = "../util" } uuid.workspace = true +vim = { path = "../vim" } +welcome = { path = "../welcome" } +workspace = { path = "../workspace" } +zed_actions = { path = "../zed_actions" } [dev-dependencies] call = { path = "../call", features = ["test-support"] } -# client = { path = "../client", features = ["test-support"] } editor = { path = "../editor", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } language = { path = "../language", features = ["test-support"] } -# lsp = { path = "../lsp", features = ["test-support"] } project = { path = "../project", features = ["test-support"] } -# rpc = { path = "../rpc", features = ["test-support"] } -# settings = { path = "../settings", features = ["test-support"] } text = { path = "../text", features = ["test-support"] } -# util = { path = "../util", features = ["test-support"] } -workspace = { path = "../workspace", features = ["test-support"] } unindent.workspace = true +workspace = { path = "../workspace", features = ["test-support"] } [package.metadata.bundle-dev] icon = ["resources/app-icon-preview@2x.png", "resources/app-icon-preview.png"]