Hoist `languages` crate's dependencies to the workspace level (#8394)

Marshall Bowers created 2 years ago

This PR hoists all of the dependencies of the `languages` crate to the
workspace level.

Release Notes:

- N/A

Change summary

Cargo.lock                      | 19 +++----------
Cargo.toml                      |  2 +
crates/copilot/Cargo.toml       |  2 
crates/journal/Cargo.toml       |  2 
crates/languages/Cargo.toml     | 45 +++++++++++++++++-----------------
crates/node_runtime/Cargo.toml  |  2 
crates/terminal/Cargo.toml      |  2 
crates/terminal_view/Cargo.toml |  2 
crates/zed/Cargo.toml           |  9 +++---
9 files changed, 38 insertions(+), 47 deletions(-)

Detailed changes

Cargo.lock

@@ -4829,7 +4829,7 @@ dependencies = [
  "schemars",
  "serde",
  "settings",
- "shellexpand 2.1.2",
+ "shellexpand",
  "util",
  "workspace",
 ]
@@ -5049,7 +5049,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "settings",
- "shellexpand 3.1.0",
+ "shellexpand",
  "smol",
  "task",
  "text",
@@ -8620,15 +8620,6 @@ dependencies = [
  "dirs 4.0.0",
 ]
 
-[[package]]
-name = "shellexpand"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
-dependencies = [
- "dirs 4.0.0",
-]
-
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -9526,7 +9517,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "settings",
- "shellexpand 2.1.2",
+ "shellexpand",
  "smallvec",
  "smol",
  "task",
@@ -9561,7 +9552,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "settings",
- "shellexpand 2.1.2",
+ "shellexpand",
  "smallvec",
  "smol",
  "task",
@@ -12127,7 +12118,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "settings",
- "shellexpand 2.1.2",
+ "shellexpand",
  "simplelog",
  "smallvec",
  "smol",

Cargo.toml

@@ -133,6 +133,7 @@ journal = { path = "crates/journal" }
 language = { path = "crates/language" }
 language_selector = { path = "crates/language_selector" }
 language_tools = { path = "crates/language_tools" }
+languages = { path = "crates/languages" }
 live_kit_client = { path = "crates/live_kit_client" }
 live_kit_server = { path = "crates/live_kit_server" }
 lsp = { path = "crates/lsp" }
@@ -228,6 +229,7 @@ serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
 serde_json_lenient = { version = "0.1", features = ["preserve_order", "raw_value"] }
 serde_repr = "0.1"
 sha2 = "0.10"
+shellexpand = "2.1.0"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2"
 strum = { version = "0.25.0", features = ["derive"] }

crates/copilot/Cargo.toml

@@ -22,7 +22,7 @@ test-support = [
 [dependencies]
 anyhow.workspace = true
 async-compression.workspace = true
-async-tar = "0.4.2"
+async-tar.workspace = true
 collections.workspace = true
 futures.workspace = true
 gpui.workspace = true

crates/journal/Cargo.toml

@@ -19,7 +19,7 @@ log.workspace = true
 schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
-shellexpand = "2.1.0"
+shellexpand.workspace = true
 util.workspace = true
 workspace.workspace = true
 

crates/languages/Cargo.toml

@@ -7,12 +7,32 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 anyhow.workspace = true
+async-compression.workspace = true
+async-tar.workspace = true
+async-trait.workspace = true
+collections.workspace = true
+feature_flags.workspace = true
+futures.workspace = true
 gpui.workspace = true
 language.workspace = true
+lazy_static.workspace = true
+log.workspace = true
+lsp.workspace = true
 node_runtime.workspace = true
+parking_lot.workspace = true
+project.workspace = true
+regex.workspace = true
+rope.workspace = true
 rust-embed = "8.2.0"
+schemars.workspace = true
+serde.workspace = true
+serde_derive.workspace = true
+serde_json.workspace = true
 settings.workspace = true
-
+shellexpand.workspace = true
+smol.workspace = true
+task.workspace = true
+toml.workspace = true
 tree-sitter-astro.workspace = true
 tree-sitter-bash.workspace = true
 tree-sitter-c-sharp.workspace = true
@@ -20,8 +40,8 @@ tree-sitter-c.workspace = true
 tree-sitter-clojure.workspace = true
 tree-sitter-cpp.workspace = true
 tree-sitter-css.workspace = true
-tree-sitter-dockerfile.workspace = true
 tree-sitter-dart.workspace = true
+tree-sitter-dockerfile.workspace = true
 tree-sitter-elixir.workspace = true
 tree-sitter-elm.workspace = true
 tree-sitter-embedded-template.workspace = true
@@ -60,27 +80,6 @@ tree-sitter-yaml.workspace = true
 tree-sitter-zig.workspace = true
 tree-sitter.workspace = true
 util.workspace = true
-lsp.workspace = true
-async-trait = "0.1.77"
-shellexpand = "3.1.0"
-serde_json.workspace = true
-serde_derive.workspace = true
-futures.workspace = true
-smol.workspace = true
-toml.workspace = true
-lazy_static.workspace = true
-schemars.workspace = true
-log.workspace = true
-task.workspace = true
-parking_lot.workspace = true
-async-compression = "0.4.6"
-collections.workspace = true
-async-tar = "0.4.2"
-regex.workspace = true
-feature_flags.workspace = true
-project.workspace = true
-serde.workspace = true
-rope.workspace = true
 
 [dev-dependencies]
 text.workspace = true

crates/node_runtime/Cargo.toml

@@ -12,7 +12,7 @@ doctest = false
 [dependencies]
 anyhow.workspace = true
 async-compression.workspace = true
-async-tar = "0.4.2"
+async-tar.workspace = true
 async-trait.workspace = true
 futures.workspace = true
 log.workspace = true

crates/terminal/Cargo.toml

@@ -30,7 +30,7 @@ serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
 settings.workspace = true
-shellexpand = "2.1.0"
+shellexpand.workspace = true
 smallvec.workspace = true
 smol.workspace = true
 theme.workspace = true

crates/terminal_view/Cargo.toml

@@ -31,7 +31,7 @@ serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
 settings.workspace = true
-shellexpand = "2.1.0"
+shellexpand.workspace = true
 smallvec.workspace = true
 smol.workspace = true
 terminal.workspace = true

crates/zed/Cargo.toml

@@ -65,6 +65,7 @@ journal.workspace = true
 language.workspace = true
 language_selector.workspace = true
 language_tools.workspace = true
+languages.workspace = true
 lazy_static.workspace = true
 libc = "0.2"
 log.workspace = true
@@ -90,8 +91,6 @@ release_channel.workspace = true
 rope.workspace = true
 rpc.workspace = true
 rsa = "0.4"
-task.workspace = true
-tasks_ui.workspace = true
 rust-embed.workspace = true
 schemars.workspace = true
 search.workspace = true
@@ -100,11 +99,13 @@ serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
 settings.workspace = true
-shellexpand = "2.1.0"
+shellexpand.workspace = true
 simplelog = "0.9"
 smallvec.workspace = true
 smol.workspace = true
 sum_tree.workspace = true
+task.workspace = true
+tasks_ui.workspace = true
 tempfile.workspace = true
 terminal_view.workspace = true
 text.workspace = true
@@ -121,8 +122,6 @@ vim.workspace = true
 welcome.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
-languages = { version = "0.1.0", path = "../languages" }
-
 
 [dev-dependencies]
 call = { workspace = true, features = ["test-support"] }