diff --git a/Cargo.toml b/Cargo.toml index 127557166848e36cabd50dbe911367083e839fd4..1c325fbb8e102bfb06d69b5f4b3202d888750bcf 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 b54271ee2df279f4686375a58e0649b5ddac51e7..a11174357b7612b8b7455217cbc1fd7fb1f4b2f7 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 4e738c06510e4a6662969f8d14c32cabef646138..c1d8baa118b0946410d57e58c8ea23ce17c7b5cb 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 560a754bf7ead2d9bd7babf309f084325a0f2916..a3b75e3abadcbce4798e077b825a2166099e17ec 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 778ae42ec41f3d7a9a59171cd96bd83180d1f09f..4a86a33d71bb7ad664795ce668cdb7fc49d7eac3 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 50f81c335ce670a44d90c11c99a0d7e0f0be13a4..994e61a3867710be9d6f53871bb1c3760e87b7e0 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 f4d75cc582d9d26957e697b744f5f43054b7d149..a837df97ddd6328033600814482c235a179d4dd2 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 f44493b32394c8c64d533d451f1e201290f75716..67d44f8bd42308556d154aa3b09e9b64102a8a8a 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 4cd81df1dc6c7558579ceb7f5f28779033b0ab1f..47c5aaa715adcf5ef8464201e0812f551675b51c 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 57b91876e388f9e2c60101c514daa7a661651b42..1acc14892c2ed5b4d0a438bb5e9385dbedf0fa3a 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 f4981ac13a9744e82b08eff456e947e59db6ddc8..5eab919b7cda7805f687a9a8cd63350cfcb47955 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 3e88d723139447e393abb4b4fe61278309afed5f..b1fa0eda785c9361f1d0e7b5be20454e6dd83255 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 88c40665c20ed23aafffe5e92e297db0403f9f64..858f67cf5fd9a055a091de6c782e045ee56d6d37 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 4e15ccf679db6d6de21a72f9094ee7c69508d447..d09b346348ff63aa7911938ded324a6aa88f7b8c 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 70032d83aaa3bb930c5b93336b9fcf8d6d3fec2c..95057b3d0ef54b88bce881e2812f798abcffed7e 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 8cced6d08951bdecabb22c8921c30262acf97ad4..cfb3a9c885dd6154774a7cd4ec26fa0f7b21b39d 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 4370aaab06870ed8f232271a51eced39562164ad..86b4ed9e409abec79d00cdfce92003cd7c7c3887 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 32ab6abbb3c1b022495d286859b4826881de1f19..eb43be61cef588f211ecf0cccff786c2002e8497 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 e30ab56e45d1b088aa5ce811dfe246094c00c413..4ce5f24e9d3bd7bee19ff4a3123d3644368a6f38 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 2b72959e25e76bfe35ea8c8ddbd921db123fc06e..195bcee10a615651428db9daa090bc0b1637897e 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 9e79b09d72ec7c398dd7cd29965a6eec797520a1..b03e62cc55d347f5a4c9be1634a6478ae37ea7d9 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 2773dd2f3b60ba27e59fa85d69b61dc684c60fc8..78f37fd5aee2615f0562e6181a477bd1af7567f8 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 fb4e79a7033ca65f7e58c5ee15d1b7ccef766629..fc8737e73fa153471d656842ec5c91057a53feee 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 fbb3ad63f34761a0f7004a818582569c87dbd7ad..ab5e428b7bce52d50fb07d48850ff4f34a0fbf65 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 716ec766443bc997c57fb77f78d94f0290aad579..7e82a50247e36367f536476a28b9dd7c79d66ed9 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 107d325677f99231f8100344226e89d6bebd4ee6..f46bdad5d5d2e2417885fdb86ea4b6e367a29edd 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 f271cd118d8de443af35999c916b21ed0c19a459..fe7dd833e967c068e4f319b7df8c5cf00d5596c1 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 38124dcc1130efe4c542eea24eb4029450cf4298..faf88c5c9ddc23f94000c3df0f2e02d17c2cbc79 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 84db04e9a67cb8d453e629cf7bd7019f8ce6d6d4..69ee515a91f9d991789260c4e13eb44cb7b90c79 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 7eb35f3b3e13a6c1006b4bafb1b871310db3bf57..abd9dd10d93a87f7060864c3f2e7fde4d48fdd53 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"