From af09861f5ccd59956e66d21452d23629fbf9c075 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 3 Oct 2023 17:39:24 -0700 Subject: [PATCH] Specify uuid crate in the root Cargo.toml Co-authored-by: Mikayla --- Cargo.toml | 1 + crates/assistant/Cargo.toml | 2 +- crates/channel/Cargo.toml | 3 ++- crates/client/Cargo.toml | 2 +- crates/collab/Cargo.toml | 1 + crates/gpui/Cargo.toml | 2 +- crates/sqlez/Cargo.toml | 2 +- crates/workspace/Cargo.toml | 2 +- crates/zed/Cargo.toml | 2 +- 9 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 37322253124d6c8e2885d6d637ea197f4cec8b3f..a634b7f67b4ab22b79353a39d2c7d8fcbed55678 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,6 +120,7 @@ tree-sitter = "0.20" unindent = { version = "0.1.7" } pretty_assertions = "1.3.0" git2 = { version = "0.15", default-features = false} +uuid = { version = "1.1.2", features = ["v4"] } tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "1b0321ee85701d5036c334a6f04761cdc672e64c" } tree-sitter-c = "0.20.1" diff --git a/crates/assistant/Cargo.toml b/crates/assistant/Cargo.toml index 5d141b32d5a448c43a9db96f0879461709963697..f1daf47bab05c96acc0876b1aff9a2871d5c416a 100644 --- a/crates/assistant/Cargo.toml +++ b/crates/assistant/Cargo.toml @@ -21,8 +21,8 @@ search = { path = "../search" } settings = { path = "../settings" } theme = { path = "../theme" } util = { path = "../util" } -uuid = { version = "1.1.2", features = ["v4"] } workspace = { path = "../workspace" } +uuid.workspace = true anyhow.workspace = true chrono = { version = "0.4", features = ["serde"] } diff --git a/crates/channel/Cargo.toml b/crates/channel/Cargo.toml index 16a1d418d5c17750db582252118c3ddcc1cad2d3..6bd177bed573bc8a034dbb50588c77b111422242 100644 --- a/crates/channel/Cargo.toml +++ b/crates/channel/Cargo.toml @@ -23,6 +23,7 @@ language = { path = "../language" } settings = { path = "../settings" } feature_flags = { path = "../feature_flags" } sum_tree = { path = "../sum_tree" } +clock = { path = "../clock" } anyhow.workspace = true futures.workspace = true @@ -38,7 +39,7 @@ smol.workspace = true thiserror.workspace = true time.workspace = true tiny_http = "0.8" -uuid = { version = "1.1.2", features = ["v4"] } +uuid.workspace = true url = "2.2" serde.workspace = true serde_derive.workspace = true diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index e3038e5bcc49bd41b756062b676e00f4f355867a..d3229170133bc63886b912b21219e123483dc9a7 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -37,7 +37,7 @@ smol.workspace = true thiserror.workspace = true time.workspace = true tiny_http = "0.8" -uuid = { version = "1.1.2", features = ["v4"] } +uuid.workspace = true url = "2.2" serde.workspace = true serde_derive.workspace = true diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index 6af23223c23b1b42684f0305fdc25ce6c59e1511..ecc4b57b120f2bbd1b0e0ab8da8284034595d5ae 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -57,6 +57,7 @@ toml.workspace = true tracing = "0.1.34" tracing-log = "0.1.3" tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] } +uuid.workspace = true [dev-dependencies] audio = { path = "../audio" } diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml index 95b7ccb559980e746eeaaa3a5eb07b73166997b4..cdd5a0a5c88d42d3defa9cc1e5c27f223f257a52 100644 --- a/crates/gpui/Cargo.toml +++ b/crates/gpui/Cargo.toml @@ -53,7 +53,7 @@ thiserror.workspace = true time.workspace = true tiny-skia = "0.5" usvg = { version = "0.14", features = [] } -uuid = { version = "1.1.2", features = ["v4"] } +uuid.workspace = true waker-fn = "1.1.0" [build-dependencies] diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml index 6811ee054c1fc90e9aebf03a07d29e894bec9875..1d1d052e93f1dd436da02e8a149c47413a4295d8 100644 --- a/crates/sqlez/Cargo.toml +++ b/crates/sqlez/Cargo.toml @@ -13,4 +13,4 @@ thread_local = "1.1.4" lazy_static.workspace = true parking_lot.workspace = true futures.workspace = true -uuid = { version = "1.1.2", features = ["v4"] } +uuid.workspace = true diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml index e2dae07b8c9dc9c75ac60c32499a7884834b75f4..41c86e538de466825115359d8bffcec816c06d8c 100644 --- a/crates/workspace/Cargo.toml +++ b/crates/workspace/Cargo.toml @@ -51,7 +51,7 @@ serde.workspace = true serde_derive.workspace = true serde_json.workspace = true smallvec.workspace = true -uuid = { version = "1.1.2", features = ["v4"] } +uuid.workspace = true [dev-dependencies] call = { path = "../call", features = ["test-support"] } diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index fde598a735024c599626ff31c2c6d2a8397f61d8..bd6a85e3aaedc9ae1cc6fc8380a13227058427dd 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -138,7 +138,7 @@ tree-sitter-nu.workspace = true url = "2.2" urlencoding = "2.1.2" -uuid = { version = "1.1.2", features = ["v4"] } +uuid.workspace = true [dev-dependencies] call = { path = "../call", features = ["test-support"] }