From 6f4385e73741b0cba6cb3028ecd8d4d76086ba4b Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Wed, 2 Oct 2024 16:26:48 -0400
Subject: [PATCH] Sort dependencies in `Cargo.toml` files (#18657)

This PR sorts the dependencies in various `Cargo.toml` files after
#18414.

Release Notes:

- N/A
---
 Cargo.toml                       | 24 ++++++++++++------------
 crates/collab/Cargo.toml         | 12 ++++++------
 crates/evals/Cargo.toml          | 12 ++++++------
 crates/extension/Cargo.toml      | 17 ++++++++---------
 crates/extension_cli/Cargo.toml  |  2 +-
 crates/http_client/Cargo.toml    |  6 +++---
 crates/reqwest_client/Cargo.toml |  4 ++--
 crates/semantic_index/Cargo.toml | 18 +++++++++---------
 crates/ureq_client/Cargo.toml    |  7 +++----
 crates/vim/Cargo.toml            | 10 ++++------
 crates/zed/Cargo.toml            |  2 +-
 11 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index fea528db5b..8feb93a578 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,6 @@ members = [
     "crates/assistant",
     "crates/assistant_slash_command",
     "crates/assistant_tool",
-    "crates/ureq_client",
     "crates/audio",
     "crates/auto_update",
     "crates/breadcrumbs",
@@ -87,8 +86,8 @@ members = [
     "crates/release_channel",
     "crates/remote",
     "crates/remote_server",
-    "crates/reqwest_client",
     "crates/repl",
+    "crates/reqwest_client",
     "crates/rich_text",
     "crates/rope",
     "crates/rpc",
@@ -123,6 +122,7 @@ members = [
     "crates/ui",
     "crates/ui_input",
     "crates/ui_macros",
+    "crates/ureq_client",
     "crates/util",
     "crates/vcs_menu",
     "crates/vim",
@@ -176,6 +176,7 @@ members = [
 default-members = ["crates/zed"]
 
 [workspace.dependencies]
+
 #
 # Workspace member crates
 #
@@ -187,8 +188,6 @@ assets = { path = "crates/assets" }
 assistant = { path = "crates/assistant" }
 assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_tool = { path = "crates/assistant_tool" }
-ureq_client = { path = "crates/ureq_client" }
-async-compat = { version = "0.2.1" }
 audio = { path = "crates/audio" }
 auto_update = { path = "crates/auto_update" }
 breadcrumbs = { path = "crates/breadcrumbs" }
@@ -223,7 +222,6 @@ go_to_line = { path = "crates/go_to_line" }
 google_ai = { path = "crates/google_ai" }
 gpui = { path = "crates/gpui" }
 gpui_macros = { path = "crates/gpui_macros" }
-handlebars = "4.3"
 headless = { path = "crates/headless" }
 html_to_markdown = { path = "crates/html_to_markdown" }
 http_client = { path = "crates/http_client" }
@@ -302,6 +300,7 @@ title_bar = { path = "crates/title_bar" }
 ui = { path = "crates/ui" }
 ui_input = { path = "crates/ui_input" }
 ui_macros = { path = "crates/ui_macros" }
+ureq_client = { path = "crates/ureq_client" }
 util = { path = "crates/util" }
 vcs_menu = { path = "crates/vcs_menu" }
 vim = { path = "crates/vim" }
@@ -321,6 +320,7 @@ any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
 ashpd = "0.9.1"
+async-compat = "0.2.1"
 async-compression = { version = "0.4", features = ["gzip", "futures-io"] }
 async-dispatcher = "0.1"
 async-fs = "1.6"
@@ -359,15 +359,15 @@ futures-batch = "0.6.1"
 futures-lite = "1.13"
 git2 = { version = "0.19", default-features = false }
 globset = "0.4"
+handlebars = "4.3"
 heed = { version = "0.20.1", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
-hyper = "0.14"
 html5ever = "0.27.0"
+hyper = "0.14"
 ignore = "0.4.22"
 image = "0.25.1"
 indexmap = { version = "1.6.2", features = ["serde"] }
 indoc = "2"
-
 itertools = "0.13.0"
 jsonwebtoken = "9.3"
 libc = "0.2"
@@ -382,17 +382,18 @@ ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
 pathdiff = "0.2"
-profiling = "1"
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = "1.3.0"
+profiling = "1"
 prost = "0.9"
 prost-build = "0.9"
 prost-types = "0.9"
+protols-tree-sitter-proto = { git = "https://github.com/zed-industries/tree-sitter-proto", rev = "0848bd30a64be48772e15fbb9d5ba8c0cc5772ad" }
 pulldown-cmark = { version = "0.12.0", default-features = false }
 rand = "0.8.5"
 regex = "1.5"
 repair_json = "0.1.0"
-reqwest  = { git = "https://github.com/zed-industries/reqwest.git", rev = "fd110f6998da16bbca97b6dddda9be7827c50e29" }
+reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "fd110f6998da16bbca97b6dddda9be7827c50e29" }
 rsa = "0.9.6"
 runtimelib = { version = "0.15", default-features = false, features = [
     "async-dispatcher-runtime",
@@ -453,15 +454,14 @@ tree-sitter-html = "0.20"
 tree-sitter-jsdoc = "0.23"
 tree-sitter-json = "0.23"
 tree-sitter-md = { git = "https://github.com/zed-industries/tree-sitter-markdown", rev = "4cfa6aad6b75052a5077c80fd934757d9267d81b" }
-protols-tree-sitter-proto = { git = "https://github.com/zed-industries/tree-sitter-proto", rev = "0848bd30a64be48772e15fbb9d5ba8c0cc5772ad" }
 tree-sitter-python = "0.23"
 tree-sitter-regex = "0.23"
 tree-sitter-ruby = "0.23"
 tree-sitter-rust = "0.23"
 tree-sitter-typescript = "0.23"
-tree-sitter-yaml =  { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
-unindent = "0.1.7"
+tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
 unicase = "2.6"
+unindent = "0.1.7"
 unicode-segmentation = "1.10"
 url = "2.2"
 uuid = { version = "1.1.2", features = ["v4", "v5", "serde"] }
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 7d4c5d0c70..de7a3c6214 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -28,8 +28,8 @@ axum = { version = "0.6", features = ["json", "headers", "ws"] }
 axum-extra = { version = "0.4", features = ["erased-json"] }
 base64.workspace = true
 chrono.workspace = true
-clock.workspace = true
 clickhouse.workspace = true
+clock.workspace = true
 collections.workspace = true
 dashmap.workspace = true
 envy = "0.4.2"
@@ -37,19 +37,19 @@ futures.workspace = true
 google_ai.workspace = true
 hex.workspace = true
 http_client.workspace = true
-reqwest_client.workspace = true
 jsonwebtoken.workspace = true
 live_kit_server.workspace = true
 log.workspace = true
 nanoid.workspace = true
 open_ai.workspace = true
-supermaven_api.workspace = true
 parking_lot.workspace = true
 prometheus = "0.13"
 prost.workspace = true
 rand.workspace = true
 reqwest = { version = "0.11", features = ["json"] }
+reqwest_client.workspace = true
 rpc.workspace = true
+rustc-demangle.workspace = true
 scrypt = "0.11"
 sea-orm = { version = "1.1.0-rc.1", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
 semantic_version.workspace = true
@@ -61,7 +61,7 @@ sha2.workspace = true
 sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] }
 strum.workspace = true
 subtle.workspace = true
-rustc-demangle.workspace = true
+supermaven_api.workspace = true
 telemetry_events.workspace = true
 text.workspace = true
 thiserror.workspace = true
@@ -85,6 +85,7 @@ client = { workspace = true, features = ["test-support"] }
 collab_ui = { workspace = true, features = ["test-support"] }
 collections = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
+dev_server_projects.workspace = true
 editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
 file_finder.workspace = true
@@ -92,6 +93,7 @@ fs = { workspace = true, features = ["test-support"] }
 git = { workspace = true, features = ["test-support"] }
 git_hosting_providers.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
+headless.workspace = true
 hyper.workspace = true
 indoc.workspace = true
 language = { workspace = true, features = ["test-support"] }
@@ -108,7 +110,6 @@ recent_projects = { workspace = true }
 release_channel.workspace = true
 remote = { workspace = true, features = ["test-support"] }
 remote_server.workspace = true
-dev_server_projects.workspace = true
 rpc = { workspace = true, features = ["test-support"] }
 sea-orm = { version = "1.1.0-rc.1", features = ["sqlx-sqlite"] }
 serde_json.workspace = true
@@ -120,7 +121,6 @@ unindent.workspace = true
 util.workspace = true
 workspace = { workspace = true, features = ["test-support"] }
 worktree = { workspace = true, features = ["test-support"] }
-headless.workspace = true
 
 [package.metadata.cargo-machete]
 ignored = ["async-stripe"]
diff --git a/crates/evals/Cargo.toml b/crates/evals/Cargo.toml
index 52af0ce446..2697b76845 100644
--- a/crates/evals/Cargo.toml
+++ b/crates/evals/Cargo.toml
@@ -14,9 +14,8 @@ name = "eval"
 path = "src/eval.rs"
 
 [dependencies]
-clap.workspace = true
 anyhow.workspace = true
-ureq_client.workspace = true
+clap.workspace = true
 client.workspace = true
 clock.workspace = true
 collections.workspace = true
@@ -25,14 +24,15 @@ feature_flags.workspace = true
 fs.workspace = true
 git.workspace = true
 gpui.workspace = true
+http_client.workspace = true
 language.workspace = true
 languages.workspace = true
-http_client.workspace = true
+node_runtime.workspace = true
 open_ai.workspace = true
 project.workspace = true
-settings.workspace = true
+semantic_index.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+settings.workspace = true
 smol.workspace = true
-semantic_index.workspace = true
-node_runtime.workspace = true
+ureq_client.workspace = true
diff --git a/crates/extension/Cargo.toml b/crates/extension/Cargo.toml
index 9fea3a768a..2b1d6193f8 100644
--- a/crates/extension/Cargo.toml
+++ b/crates/extension/Cargo.toml
@@ -39,32 +39,31 @@ schemars.workspace = true
 semantic_version.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+serde_json_lenient.workspace = true
 settings.workspace = true
 snippet_provider.workspace = true
+task.workspace = true
 theme.workspace = true
 toml.workspace = true
 ui.workspace = true
 url.workspace = true
 util.workspace = true
 wasm-encoder.workspace = true
-wasmtime.workspace = true
-wasmtime-wasi.workspace = true
 wasmparser.workspace = true
+wasmtime-wasi.workspace = true
+wasmtime.workspace = true
 wit-component.workspace = true
 workspace.workspace = true
-task.workspace = true
-serde_json_lenient.workspace = true
 
 [dev-dependencies]
-ureq_client.workspace = true
 ctor.workspace = true
 env_logger.workspace = true
-parking_lot.workspace = true
-reqwest_client.workspace = true
-tokio.workspace = true
-
 fs = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
 language = { workspace = true, features = ["test-support"] }
+parking_lot.workspace = true
 project = { workspace = true, features = ["test-support"] }
+reqwest_client.workspace = true
+tokio.workspace = true
+ureq_client.workspace = true
 workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/extension_cli/Cargo.toml b/crates/extension_cli/Cargo.toml
index 3e109a0036..6de3e858d4 100644
--- a/crates/extension_cli/Cargo.toml
+++ b/crates/extension_cli/Cargo.toml
@@ -18,9 +18,9 @@ clap = { workspace = true, features = ["derive"] }
 env_logger.workspace = true
 extension = { workspace = true, features = ["no-webrtc"] }
 fs.workspace = true
-reqwest_client.workspace = true
 language.workspace = true
 log.workspace = true
+reqwest_client.workspace = true
 rpc.workspace = true
 serde.workspace = true
 serde_json.workspace = true
diff --git a/crates/http_client/Cargo.toml b/crates/http_client/Cargo.toml
index 52c2947b8a..e8585cff98 100644
--- a/crates/http_client/Cargo.toml
+++ b/crates/http_client/Cargo.toml
@@ -16,13 +16,13 @@ path = "src/http_client.rs"
 doctest = true
 
 [dependencies]
-http = "1.1"
-rustls.workspace = true
-rustls-native-certs.workspace = true
 anyhow.workspace = true
 derive_more.workspace = true
 futures.workspace = true
+http = "1.1"
 log.workspace = true
+rustls-native-certs.workspace = true
+rustls.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 smol.workspace = true
diff --git a/crates/reqwest_client/Cargo.toml b/crates/reqwest_client/Cargo.toml
index d393191252..060a382d72 100644
--- a/crates/reqwest_client/Cargo.toml
+++ b/crates/reqwest_client/Cargo.toml
@@ -21,11 +21,11 @@ path = "examples/client.rs"
 
 [dependencies]
 anyhow.workspace = true
+bytes = "1.0"
 futures.workspace = true
+http_client.workspace = true
 serde.workspace = true
 smol.workspace = true
-http_client.workspace = true
 tokio.workspace = true
-bytes = "1.0"
 
 reqwest = { workspace = true, features = ["rustls-tls-manual-roots", "stream"] }
diff --git a/crates/semantic_index/Cargo.toml b/crates/semantic_index/Cargo.toml
index 8842093f78..508e64ffea 100644
--- a/crates/semantic_index/Cargo.toml
+++ b/crates/semantic_index/Cargo.toml
@@ -26,42 +26,42 @@ clock.workspace = true
 collections.workspace = true
 feature_flags.workspace = true
 fs.workspace = true
-futures.workspace = true
 futures-batch.workspace = true
+futures.workspace = true
 gpui.workspace = true
+heed.workspace = true
+http_client.workspace = true
 language.workspace = true
 language_model.workspace = true
 log.workspace = true
-heed.workspace = true
-http_client.workspace = true
 open_ai.workspace = true
 parking_lot.workspace = true
 project.workspace = true
-settings.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+settings.workspace = true
 sha2.workspace = true
 smol.workspace = true
 theme.workspace = true
 tree-sitter.workspace = true
 ui. workspace = true
-util. workspace = true
 unindent.workspace = true
+util. workspace = true
 workspace.workspace = true
 worktree.workspace = true
 
 [dev-dependencies]
-ureq_client.workspace = true
-env_logger.workspace = true
 client = { workspace = true, features = ["test-support"] }
+env_logger.workspace = true
 fs = { workspace = true, features = ["test-support"] }
 futures.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
+http_client = { workspace = true, features = ["test-support"] }
 language = { workspace = true, features = ["test-support"] }
 languages.workspace = true
 project = { workspace = true, features = ["test-support"] }
 tempfile.workspace = true
+ureq_client.workspace = true
 util = { workspace = true, features = ["test-support"] }
-worktree = { workspace = true, features = ["test-support"] }
 workspace = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
+worktree = { workspace = true, features = ["test-support"] }
diff --git a/crates/ureq_client/Cargo.toml b/crates/ureq_client/Cargo.toml
index a14419a226..757ba01094 100644
--- a/crates/ureq_client/Cargo.toml
+++ b/crates/ureq_client/Cargo.toml
@@ -22,11 +22,10 @@ path = "examples/client.rs"
 [dependencies]
 anyhow.workspace = true
 futures.workspace = true
-serde.workspace = true
-smol.workspace = true
 gpui.workspace = true
 http_client.workspace = true
-util.workspace = true
 parking_lot.workspace = true
-
+serde.workspace = true
+smol.workspace = true
 ureq = "=2.9.1"
+util.workspace = true
diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml
index 99394b7922..bb347f49b7 100644
--- a/crates/vim/Cargo.toml
+++ b/crates/vim/Cargo.toml
@@ -28,10 +28,9 @@ itertools.workspace = true
 language.workspace = true
 log.workspace = true
 multi_buffer.workspace = true
-nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", branch = "master", features = [
-    "use_tokio",
-], optional = true }
+nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", branch = "master", features = ["use_tokio"], optional = true }
 regex.workspace = true
+schemars.workspace = true
 search.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
@@ -39,21 +38,20 @@ serde_json.workspace = true
 settings.workspace = true
 tokio = { version = "1.15", "optional" = true }
 ui.workspace = true
+util.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
-schemars.workspace = true
-util.workspace = true
 
 [dev-dependencies]
 command_palette.workspace = true
 editor = { workspace = true, features = ["test-support"] }
 futures.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
-release_channel.workspace = true
 indoc.workspace = true
 language = { workspace = true, features = ["test-support"] }
 lsp = { workspace = true, features = ["test-support"] }
 parking_lot.workspace = true
+release_channel.workspace = true
 settings.workspace = true
 util = { workspace = true, features = ["test-support"] }
 workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index ac73bf15ee..e340e176a7 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -57,7 +57,6 @@ http_client.workspace = true
 image_viewer.workspace = true
 inline_completion_button.workspace = true
 install_cli.workspace = true
-ureq_client.workspace = true
 journal.workspace = true
 language.workspace = true
 language_model.workspace = true
@@ -108,6 +107,7 @@ theme.workspace = true
 theme_selector.workspace = true
 time.workspace = true
 ui.workspace = true
+ureq_client.workspace = true
 url.workspace = true
 urlencoding = "2.1.2"
 util.workspace = true