From abdccf73939e46dca6d73801bb6437317f519123 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 20 Apr 2023 17:47:18 -0700 Subject: [PATCH] Use a workspace dependency for the futures crate --- Cargo.toml | 1 + crates/activity_indicator/Cargo.toml | 2 +- crates/call/Cargo.toml | 2 +- crates/client/Cargo.toml | 2 +- crates/collab/Cargo.toml | 2 +- crates/collab_ui/Cargo.toml | 2 +- crates/copilot/Cargo.toml | 2 +- crates/copilot_button/Cargo.toml | 2 +- crates/editor/Cargo.toml | 2 +- crates/feedback/Cargo.toml | 2 +- crates/fs/Cargo.toml | 2 +- crates/git/Cargo.toml | 2 +- crates/gpui/Cargo.toml | 2 +- crates/language/Cargo.toml | 2 +- crates/live_kit_client/Cargo.toml | 4 ++-- crates/live_kit_server/Cargo.toml | 2 +- crates/lsp/Cargo.toml | 2 +- crates/node_runtime/Cargo.toml | 2 +- crates/project/Cargo.toml | 2 +- crates/project_panel/Cargo.toml | 2 +- crates/project_symbols/Cargo.toml | 2 +- crates/rpc/Cargo.toml | 2 +- crates/search/Cargo.toml | 2 +- crates/settings/Cargo.toml | 2 +- crates/sqlez/Cargo.toml | 4 ++-- crates/terminal/Cargo.toml | 2 +- crates/terminal_view/Cargo.toml | 2 +- crates/util/Cargo.toml | 2 +- crates/workspace/Cargo.toml | 2 +- crates/zed/Cargo.toml | 2 +- 30 files changed, 32 insertions(+), 31 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1275571668..1c325fbb8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,6 +77,7 @@ serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] } rand = { version = "0.8" } postage = { version = "0.5", features = ["futures-traits"] } smallvec = { version = "1.6", features = ["union"] } +futures = { version = "0.3" } [patch.crates-io] tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "c51896d32dcc11a38e41f36e3deb1a6a9c4f4b14" } diff --git a/crates/activity_indicator/Cargo.toml b/crates/activity_indicator/Cargo.toml index b54271ee2d..a11174357b 100644 --- a/crates/activity_indicator/Cargo.toml +++ b/crates/activity_indicator/Cargo.toml @@ -17,5 +17,5 @@ project = { path = "../project" } settings = { path = "../settings" } util = { path = "../util" } workspace = { path = "../workspace" } -futures = "0.3" +futures = { workspace = true } smallvec = { workspace = true } diff --git a/crates/call/Cargo.toml b/crates/call/Cargo.toml index 4e738c0651..c1d8baa118 100644 --- a/crates/call/Cargo.toml +++ b/crates/call/Cargo.toml @@ -33,7 +33,7 @@ util = { path = "../util" } anyhow = "1.0.38" async-broadcast = "0.4" -futures = "0.3" +futures = { workspace = true } postage = { workspace = true } [dev-dependencies] diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index 560a754bf7..a3b75e3aba 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -22,7 +22,7 @@ sum_tree = { path = "../sum_tree" } anyhow = "1.0.38" async-recursion = "0.3" async-tungstenite = { version = "0.16", features = ["async-tls"] } -futures = "0.3" +futures = { workspace = true } image = "0.23" lazy_static = "1.4.0" log = { version = "0.4.16", features = ["kv_unstable_serde"] } diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index 778ae42ec4..4a86a33d71 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -27,7 +27,7 @@ base64 = "0.13" clap = { version = "3.1", features = ["derive"], optional = true } dashmap = "5.4" envy = "0.4.2" -futures = "0.3" +futures = { workspace = true } hyper = "0.14" lazy_static = "1.4" lipsum = { version = "0.8", optional = true } diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml index 50f81c335c..994e61a386 100644 --- a/crates/collab_ui/Cargo.toml +++ b/crates/collab_ui/Cargo.toml @@ -40,7 +40,7 @@ theme = { path = "../theme" } util = { path = "../util" } workspace = { path = "../workspace" } anyhow = "1.0" -futures = "0.3" +futures = { workspace = true } log = "0.4" postage = { workspace = true } serde = { workspace = true } diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml index f4d75cc582..a837df97dd 100644 --- a/crates/copilot/Cargo.toml +++ b/crates/copilot/Cargo.toml @@ -35,7 +35,7 @@ log = "0.4" serde = { workspace = true } serde_derive = { workspace = true } smol = "1.2.5" -futures = "0.3" +futures = { workspace = true } [dev-dependencies] clock = { path = "../clock" } diff --git a/crates/copilot_button/Cargo.toml b/crates/copilot_button/Cargo.toml index f44493b323..67d44f8bd4 100644 --- a/crates/copilot_button/Cargo.toml +++ b/crates/copilot_button/Cargo.toml @@ -19,4 +19,4 @@ util = { path = "../util" } workspace = { path = "../workspace" } anyhow = "1.0" smol = "1.2.5" -futures = "0.3" +futures = { workspace = true } diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml index 4cd81df1dc..47c5aaa715 100644 --- a/crates/editor/Cargo.toml +++ b/crates/editor/Cargo.toml @@ -47,7 +47,7 @@ workspace = { path = "../workspace" } aho-corasick = "0.7" anyhow = "1.0" -futures = "0.3" +futures = { workspace = true } indoc = "1.0.4" itertools = "0.10" lazy_static = "1.4" diff --git a/crates/feedback/Cargo.toml b/crates/feedback/Cargo.toml index 57b91876e3..1acc14892c 100644 --- a/crates/feedback/Cargo.toml +++ b/crates/feedback/Cargo.toml @@ -16,7 +16,7 @@ client = { path = "../client" } editor = { path = "../editor" } language = { path = "../language" } log = "0.4" -futures = "0.3" +futures = { workspace = true } gpui = { path = "../gpui" } human_bytes = "0.4.1" isahc = "1.7" diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml index f4981ac13a..5eab919b7c 100644 --- a/crates/fs/Cargo.toml +++ b/crates/fs/Cargo.toml @@ -15,7 +15,7 @@ rope = { path = "../rope" } util = { path = "../util" } anyhow = "1.0.57" async-trait = "0.1" -futures = "0.3" +futures = { workspace = true } tempfile = "3" fsevent = { path = "../fsevent" } lazy_static = "1.4.0" diff --git a/crates/git/Cargo.toml b/crates/git/Cargo.toml index 3e88d72313..b1fa0eda78 100644 --- a/crates/git/Cargo.toml +++ b/crates/git/Cargo.toml @@ -19,7 +19,7 @@ log = { version = "0.4.16", features = ["kv_unstable_serde"] } smol = "1.2" parking_lot = "0.11.1" async-trait = "0.1" -futures = "0.3" +futures = { workspace = true } git2 = { version = "0.15", default-features = false } [dev-dependencies] diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml index 88c40665c2..858f67cf5f 100644 --- a/crates/gpui/Cargo.toml +++ b/crates/gpui/Cargo.toml @@ -25,7 +25,7 @@ ctor = "0.1" dhat = { version = "0.3", optional = true } env_logger = { version = "0.9", optional = true } etagere = "0.2" -futures = "0.3" +futures = { workspace = true } image = "0.23" itertools = "0.10" lazy_static = "1.4.0" diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml index 4e15ccf679..d09b346348 100644 --- a/crates/language/Cargo.toml +++ b/crates/language/Cargo.toml @@ -39,7 +39,7 @@ util = { path = "../util" } anyhow = "1.0.38" async-broadcast = "0.4" async-trait = "0.1" -futures = "0.3" +futures = { workspace = true } lazy_static = "1.4" log = { version = "0.4.16", features = ["kv_unstable_serde"] } parking_lot = "0.11.1" diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml index 70032d83aa..95057b3d0e 100644 --- a/crates/live_kit_client/Cargo.toml +++ b/crates/live_kit_client/Cargo.toml @@ -32,7 +32,7 @@ anyhow = "1.0.38" async-broadcast = "0.4" core-foundation = "0.9.3" core-graphics = "0.22.3" -futures = "0.3" +futures = { workspace = true } log = { version = "0.4.16", features = ["kv_unstable_serde"] } parking_lot = "0.11.1" postage = { workspace = true } @@ -56,7 +56,7 @@ cocoa = "0.24" core-foundation = "0.9.3" core-graphics = "0.22.3" foreign-types = "0.3" -futures = "0.3" +futures = { workspace = true } hmac = "0.12" jwt = "0.16" lazy_static = "1.4" diff --git a/crates/live_kit_server/Cargo.toml b/crates/live_kit_server/Cargo.toml index 8cced6d089..cfb3a9c885 100644 --- a/crates/live_kit_server/Cargo.toml +++ b/crates/live_kit_server/Cargo.toml @@ -12,7 +12,7 @@ doctest = false [dependencies] anyhow = "1.0.38" async-trait = "0.1" -futures = "0.3" +futures = { workspace = true } hmac = "0.12" log = "0.4" jwt = "0.16" diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml index 4370aaab06..86b4ed9e40 100644 --- a/crates/lsp/Cargo.toml +++ b/crates/lsp/Cargo.toml @@ -17,7 +17,7 @@ gpui = { path = "../gpui" } util = { path = "../util" } anyhow = "1.0" async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553", optional = true } -futures = "0.3" +futures = { workspace = true } log = { version = "0.4.16", features = ["kv_unstable_serde"] } lsp-types = "0.91" parking_lot = "0.11" diff --git a/crates/node_runtime/Cargo.toml b/crates/node_runtime/Cargo.toml index 32ab6abbb3..eb43be61ce 100644 --- a/crates/node_runtime/Cargo.toml +++ b/crates/node_runtime/Cargo.toml @@ -13,7 +13,7 @@ gpui = { path = "../gpui" } util = { path = "../util" } async-compression = { version = "0.3", features = ["gzip", "futures-bufread"] } async-tar = "0.4.2" -futures = "0.3" +futures = { workspace = true } anyhow = "1.0.38" parking_lot = "0.11.1" serde = { workspace = true } diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml index e30ab56e45..4ce5f24e9d 100644 --- a/crates/project/Cargo.toml +++ b/crates/project/Cargo.toml @@ -41,7 +41,7 @@ aho-corasick = "0.7" anyhow = "1.0.57" async-trait = "0.1" backtrace = "0.3" -futures = "0.3" +futures = { workspace = true } ignore = "0.4" lazy_static = "1.4.0" log = { version = "0.4.16", features = ["kv_unstable_serde"] } diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml index 2b72959e25..195bcee10a 100644 --- a/crates/project_panel/Cargo.toml +++ b/crates/project_panel/Cargo.toml @@ -20,7 +20,7 @@ theme = { path = "../theme" } util = { path = "../util" } workspace = { path = "../workspace" } postage = { workspace = true } -futures = "0.3" +futures = { workspace = true } unicase = "2.6" [dev-dependencies] diff --git a/crates/project_symbols/Cargo.toml b/crates/project_symbols/Cargo.toml index 9e79b09d72..b03e62cc55 100644 --- a/crates/project_symbols/Cargo.toml +++ b/crates/project_symbols/Cargo.toml @@ -24,7 +24,7 @@ postage = { workspace = true } smol = "1.2" [dev-dependencies] -futures = "0.3" +futures = { workspace = true } settings = { path = "../settings", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } language = { path = "../language", features = ["test-support"] } diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml index 2773dd2f3b..78f37fd5ae 100644 --- a/crates/rpc/Cargo.toml +++ b/crates/rpc/Cargo.toml @@ -21,7 +21,7 @@ anyhow = "1.0" async-lock = "2.4" async-tungstenite = "0.16" base64 = "0.13" -futures = "0.3" +futures = { workspace = true } parking_lot = "0.11.1" prost = "0.8" rand = "0.8" diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml index fb4e79a703..fc8737e73f 100644 --- a/crates/search/Cargo.toml +++ b/crates/search/Cargo.toml @@ -20,7 +20,7 @@ theme = { path = "../theme" } util = { path = "../util" } workspace = { path = "../workspace" } anyhow = "1.0" -futures = "0.3" +futures = { workspace = true } log = { version = "0.4.16", features = ["kv_unstable_serde"] } postage = { workspace = true } serde = { workspace = true } diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml index fbb3ad63f3..ab5e428b7b 100644 --- a/crates/settings/Cargo.toml +++ b/crates/settings/Cargo.toml @@ -18,7 +18,7 @@ gpui = { path = "../gpui" } sqlez = { path = "../sqlez" } fs = { path = "../fs" } anyhow = "1.0.38" -futures = "0.3" +futures = { workspace = true } theme = { path = "../theme" } staff_mode = { path = "../staff_mode" } util = { path = "../util" } diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml index 716ec76644..7e82a50247 100644 --- a/crates/sqlez/Cargo.toml +++ b/crates/sqlez/Cargo.toml @@ -14,5 +14,5 @@ smol = "1.2" thread_local = "1.1.4" lazy_static = "1.4" parking_lot = "0.11.1" -futures = "0.3" -uuid = { version = "1.1.2", features = ["v4"] } \ No newline at end of file +futures = { workspace = true } +uuid = { version = "1.1.2", features = ["v4"] } diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml index 107d325677..f46bdad5d5 100644 --- a/crates/terminal/Cargo.toml +++ b/crates/terminal/Cargo.toml @@ -20,7 +20,7 @@ procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f smallvec = { workspace = true } smol = "1.2.5" mio-extras = "2.0.6" -futures = "0.3" +futures = { workspace = true } ordered-float = "2.1.1" itertools = "0.10" dirs = "4.0.0" diff --git a/crates/terminal_view/Cargo.toml b/crates/terminal_view/Cargo.toml index f271cd118d..fe7dd833e9 100644 --- a/crates/terminal_view/Cargo.toml +++ b/crates/terminal_view/Cargo.toml @@ -24,7 +24,7 @@ terminal = { path = "../terminal" } smallvec = { workspace = true } smol = "1.2.5" mio-extras = "2.0.6" -futures = "0.3" +futures = { workspace = true } ordered-float = "2.1.1" itertools = "0.10" dirs = "4.0.0" diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml index 38124dcc11..faf88c5c9d 100644 --- a/crates/util/Cargo.toml +++ b/crates/util/Cargo.toml @@ -16,7 +16,7 @@ anyhow = "1.0.38" backtrace = "0.3" log = { version = "0.4.16", features = ["kv_unstable_serde"] } lazy_static = "1.4.0" -futures = "0.3" +futures = { workspace = true } isahc = "1.7" smol = "1.2.5" url = "2.2" diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml index 84db04e9a6..69ee515a91 100644 --- a/crates/workspace/Cargo.toml +++ b/crates/workspace/Cargo.toml @@ -38,7 +38,7 @@ util = { path = "../util" } async-recursion = "1.0.0" bincode = "1.2.1" anyhow = "1.0.38" -futures = "0.3" +futures = { workspace = true } lazy_static = "1.4" env_logger = "0.9.1" log = { version = "0.4.16", features = ["kv_unstable_serde"] } diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index 7eb35f3b3e..abd9dd10d9 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -76,7 +76,7 @@ chrono = "0.4" ctor = "0.1.20" easy-parallel = "3.1.0" env_logger = "0.9" -futures = "0.3" +futures = { workspace = true } ignore = "0.4" image = "0.23" indexmap = "1.6.2"