Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a workspace dependency for the futures crate

Browse source
This commit is contained in:
Max Brunsfeld 2023-04-20 17:47:18 -07:00
parent d82cc49f79
commit abdccf7393
30 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -77,6 +77,7 @@ serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
rand = { version = "0.8" } rand = { version = "0.8" }
postage = { version = "0.5", features = ["futures-traits"] } postage = { version = "0.5", features = ["futures-traits"] }
smallvec = { version = "1.6", features = ["union"] } smallvec = { version = "1.6", features = ["union"] }
futures = { version = "0.3" }
[patch.crates-io] [patch.crates-io]
tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "c51896d32dcc11a38e41f36e3deb1a6a9c4f4b14" } tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "c51896d32dcc11a38e41f36e3deb1a6a9c4f4b14" }

2
crates/activity_indicator/Cargo.toml
View file

@ -17,5 +17,5 @@ project = { path = "../project" }
settings = { path = "../settings" } settings = { path = "../settings" }
util = { path = "../util" } util = { path = "../util" }
workspace = { path = "../workspace" } workspace = { path = "../workspace" }
futures = "0.3" futures = { workspace = true }
smallvec = { workspace = true } smallvec = { workspace = true }

2
crates/call/Cargo.toml
View file

@ -33,7 +33,7 @@ util = { path = "../util" }
anyhow = "1.0.38" anyhow = "1.0.38"
async-broadcast = "0.4" async-broadcast = "0.4"
futures = "0.3" futures = { workspace = true }
postage = { workspace = true } postage = { workspace = true }
[dev-dependencies] [dev-dependencies]

2
crates/client/Cargo.toml
View file

@ -22,7 +22,7 @@ sum_tree = { path = "../sum_tree" }
anyhow = "1.0.38" anyhow = "1.0.38"
async-recursion = "0.3" async-recursion = "0.3"
async-tungstenite = { version = "0.16", features = ["async-tls"] } async-tungstenite = { version = "0.16", features = ["async-tls"] }
futures = "0.3" futures = { workspace = true }
image = "0.23" image = "0.23"
lazy_static = "1.4.0" lazy_static = "1.4.0"
log = { version = "0.4.16", features = ["kv_unstable_serde"] } log = { version = "0.4.16", features = ["kv_unstable_serde"] }

2
crates/collab/Cargo.toml
View file

@ -27,7 +27,7 @@ base64 = "0.13"
clap = { version = "3.1", features = ["derive"], optional = true } clap = { version = "3.1", features = ["derive"], optional = true }
dashmap = "5.4" dashmap = "5.4"
envy = "0.4.2" envy = "0.4.2"
futures = "0.3" futures = { workspace = true }
hyper = "0.14" hyper = "0.14"
lazy_static = "1.4" lazy_static = "1.4"
lipsum = { version = "0.8", optional = true } lipsum = { version = "0.8", optional = true }

2
crates/collab_ui/Cargo.toml
View file

@ -40,7 +40,7 @@ theme = { path = "../theme" }
util = { path = "../util" } util = { path = "../util" }
workspace = { path = "../workspace" } workspace = { path = "../workspace" }
anyhow = "1.0" anyhow = "1.0"
futures = "0.3" futures = { workspace = true }
log = "0.4" log = "0.4"
postage = { workspace = true } postage = { workspace = true }
serde = { workspace = true } serde = { workspace = true }

2
crates/copilot/Cargo.toml
View file

@ -35,7 +35,7 @@ log = "0.4"
serde = { workspace = true } serde = { workspace = true }
serde_derive = { workspace = true } serde_derive = { workspace = true }
smol = "1.2.5" smol = "1.2.5"
futures = "0.3" futures = { workspace = true }
[dev-dependencies] [dev-dependencies]
clock = { path = "../clock" } clock = { path = "../clock" }

2
crates/copilot_button/Cargo.toml
View file

@ -19,4 +19,4 @@ util = { path = "../util" }
workspace = { path = "../workspace" } workspace = { path = "../workspace" }
anyhow = "1.0" anyhow = "1.0"
smol = "1.2.5" smol = "1.2.5"
futures = "0.3" futures = { workspace = true }

2
crates/editor/Cargo.toml
View file

@ -47,7 +47,7 @@ workspace = { path = "../workspace" }
aho-corasick = "0.7" aho-corasick = "0.7"
anyhow = "1.0" anyhow = "1.0"
futures = "0.3" futures = { workspace = true }
indoc = "1.0.4" indoc = "1.0.4"
itertools = "0.10" itertools = "0.10"
lazy_static = "1.4" lazy_static = "1.4"

2
crates/feedback/Cargo.toml
View file

@ -16,7 +16,7 @@ client = { path = "../client" }
editor = { path = "../editor" } editor = { path = "../editor" }
language = { path = "../language" } language = { path = "../language" }
log = "0.4" log = "0.4"
futures = "0.3" futures = { workspace = true }
gpui = { path = "../gpui" } gpui = { path = "../gpui" }
human_bytes = "0.4.1" human_bytes = "0.4.1"
isahc = "1.7" isahc = "1.7"

2
crates/fs/Cargo.toml
View file

@ -15,7 +15,7 @@ rope = { path = "../rope" }
util = { path = "../util" } util = { path = "../util" }
anyhow = "1.0.57" anyhow = "1.0.57"
async-trait = "0.1" async-trait = "0.1"
futures = "0.3" futures = { workspace = true }
tempfile = "3" tempfile = "3"
fsevent = { path = "../fsevent" } fsevent = { path = "../fsevent" }
lazy_static = "1.4.0" lazy_static = "1.4.0"

2
crates/git/Cargo.toml
View file

@ -19,7 +19,7 @@ log = { version = "0.4.16", features = ["kv_unstable_serde"] }
smol = "1.2" smol = "1.2"
parking_lot = "0.11.1" parking_lot = "0.11.1"
async-trait = "0.1" async-trait = "0.1"
futures = "0.3" futures = { workspace = true }
git2 = { version = "0.15", default-features = false } git2 = { version = "0.15", default-features = false }
[dev-dependencies] [dev-dependencies]

2
crates/gpui/Cargo.toml
View file

@ -25,7 +25,7 @@ ctor = "0.1"
dhat = { version = "0.3", optional = true } dhat = { version = "0.3", optional = true }
env_logger = { version = "0.9", optional = true } env_logger = { version = "0.9", optional = true }
etagere = "0.2" etagere = "0.2"
futures = "0.3" futures = { workspace = true }
image = "0.23" image = "0.23"
itertools = "0.10" itertools = "0.10"
lazy_static = "1.4.0" lazy_static = "1.4.0"

2
crates/language/Cargo.toml
View file

@ -39,7 +39,7 @@ util = { path = "../util" }
anyhow = "1.0.38" anyhow = "1.0.38"
async-broadcast = "0.4" async-broadcast = "0.4"
async-trait = "0.1" async-trait = "0.1"
futures = "0.3" futures = { workspace = true }
lazy_static = "1.4" lazy_static = "1.4"
log = { version = "0.4.16", features = ["kv_unstable_serde"] } log = { version = "0.4.16", features = ["kv_unstable_serde"] }
parking_lot = "0.11.1" parking_lot = "0.11.1"

4
crates/live_kit_client/Cargo.toml
View file

@ -32,7 +32,7 @@ anyhow = "1.0.38"
async-broadcast = "0.4" async-broadcast = "0.4"
core-foundation = "0.9.3" core-foundation = "0.9.3"
core-graphics = "0.22.3" core-graphics = "0.22.3"
futures = "0.3" futures = { workspace = true }
log = { version = "0.4.16", features = ["kv_unstable_serde"] } log = { version = "0.4.16", features = ["kv_unstable_serde"] }
parking_lot = "0.11.1" parking_lot = "0.11.1"
postage = { workspace = true } postage = { workspace = true }
@ -56,7 +56,7 @@ cocoa = "0.24"
core-foundation = "0.9.3" core-foundation = "0.9.3"
core-graphics = "0.22.3" core-graphics = "0.22.3"
foreign-types = "0.3" foreign-types = "0.3"
futures = "0.3" futures = { workspace = true }
hmac = "0.12" hmac = "0.12"
jwt = "0.16" jwt = "0.16"
lazy_static = "1.4" lazy_static = "1.4"

2
crates/live_kit_server/Cargo.toml
View file

@ -12,7 +12,7 @@ doctest = false
[dependencies] [dependencies]
anyhow = "1.0.38" anyhow = "1.0.38"
async-trait = "0.1" async-trait = "0.1"
futures = "0.3" futures = { workspace = true }
hmac = "0.12" hmac = "0.12"
log = "0.4" log = "0.4"
jwt = "0.16" jwt = "0.16"

2
crates/lsp/Cargo.toml
View file

@ -17,7 +17,7 @@ gpui = { path = "../gpui" }
util = { path = "../util" } util = { path = "../util" }
anyhow = "1.0" anyhow = "1.0"
async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553", optional = true } 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"] } log = { version = "0.4.16", features = ["kv_unstable_serde"] }
lsp-types = "0.91" lsp-types = "0.91"
parking_lot = "0.11" parking_lot = "0.11"

2
crates/node_runtime/Cargo.toml
View file

@ -13,7 +13,7 @@ gpui = { path = "../gpui" }
util = { path = "../util" } util = { path = "../util" }
async-compression = { version = "0.3", features = ["gzip", "futures-bufread"] } async-compression = { version = "0.3", features = ["gzip", "futures-bufread"] }
async-tar = "0.4.2" async-tar = "0.4.2"
futures = "0.3" futures = { workspace = true }
anyhow = "1.0.38" anyhow = "1.0.38"
parking_lot = "0.11.1" parking_lot = "0.11.1"
serde = { workspace = true } serde = { workspace = true }

2
crates/project/Cargo.toml
View file

@ -41,7 +41,7 @@ aho-corasick = "0.7"
anyhow = "1.0.57" anyhow = "1.0.57"
async-trait = "0.1" async-trait = "0.1"
backtrace = "0.3" backtrace = "0.3"
futures = "0.3" futures = { workspace = true }
ignore = "0.4" ignore = "0.4"
lazy_static = "1.4.0" lazy_static = "1.4.0"
log = { version = "0.4.16", features = ["kv_unstable_serde"] } log = { version = "0.4.16", features = ["kv_unstable_serde"] }

2
crates/project_panel/Cargo.toml
View file

@ -20,7 +20,7 @@ theme = { path = "../theme" }
util = { path = "../util" } util = { path = "../util" }
workspace = { path = "../workspace" } workspace = { path = "../workspace" }
postage = { workspace = true } postage = { workspace = true }
futures = "0.3" futures = { workspace = true }
unicase = "2.6" unicase = "2.6"
[dev-dependencies] [dev-dependencies]

2
crates/project_symbols/Cargo.toml
View file

@ -24,7 +24,7 @@ postage = { workspace = true }
smol = "1.2" smol = "1.2"
[dev-dependencies] [dev-dependencies]
futures = "0.3" futures = { workspace = true }
settings = { path = "../settings", features = ["test-support"] } settings = { path = "../settings", features = ["test-support"] }
gpui = { path = "../gpui", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] }
language = { path = "../language", features = ["test-support"] } language = { path = "../language", features = ["test-support"] }

2
crates/rpc/Cargo.toml
View file

@ -21,7 +21,7 @@ anyhow = "1.0"
async-lock = "2.4" async-lock = "2.4"
async-tungstenite = "0.16" async-tungstenite = "0.16"
base64 = "0.13" base64 = "0.13"
futures = "0.3" futures = { workspace = true }
parking_lot = "0.11.1" parking_lot = "0.11.1"
prost = "0.8" prost = "0.8"
rand = "0.8" rand = "0.8"

2
crates/search/Cargo.toml
View file

@ -20,7 +20,7 @@ theme = { path = "../theme" }
util = { path = "../util" } util = { path = "../util" }
workspace = { path = "../workspace" } workspace = { path = "../workspace" }
anyhow = "1.0" anyhow = "1.0"
futures = "0.3" futures = { workspace = true }
log = { version = "0.4.16", features = ["kv_unstable_serde"] } log = { version = "0.4.16", features = ["kv_unstable_serde"] }
postage = { workspace = true } postage = { workspace = true }
serde = { workspace = true } serde = { workspace = true }

2
crates/settings/Cargo.toml
View file

@ -18,7 +18,7 @@ gpui = { path = "../gpui" }
sqlez = { path = "../sqlez" } sqlez = { path = "../sqlez" }
fs = { path = "../fs" } fs = { path = "../fs" }
anyhow = "1.0.38" anyhow = "1.0.38"
futures = "0.3" futures = { workspace = true }
theme = { path = "../theme" } theme = { path = "../theme" }
staff_mode = { path = "../staff_mode" } staff_mode = { path = "../staff_mode" }
util = { path = "../util" } util = { path = "../util" }

4
crates/sqlez/Cargo.toml
View file

@ -14,5 +14,5 @@ smol = "1.2"
thread_local = "1.1.4" thread_local = "1.1.4"
lazy_static = "1.4" lazy_static = "1.4"
parking_lot = "0.11.1" parking_lot = "0.11.1"
futures = "0.3" futures = { workspace = true }
uuid = { version = "1.1.2", features = ["v4"] } uuid = { version = "1.1.2", features = ["v4"] }

2
crates/terminal/Cargo.toml
View file

@ -20,7 +20,7 @@ procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f
smallvec = { workspace = true } smallvec = { workspace = true }
smol = "1.2.5" smol = "1.2.5"
mio-extras = "2.0.6" mio-extras = "2.0.6"
futures = "0.3" futures = { workspace = true }
ordered-float = "2.1.1" ordered-float = "2.1.1"
itertools = "0.10" itertools = "0.10"
dirs = "4.0.0" dirs = "4.0.0"

2
crates/terminal_view/Cargo.toml
View file

@ -24,7 +24,7 @@ terminal = { path = "../terminal" }
smallvec = { workspace = true } smallvec = { workspace = true }
smol = "1.2.5" smol = "1.2.5"
mio-extras = "2.0.6" mio-extras = "2.0.6"
futures = "0.3" futures = { workspace = true }
ordered-float = "2.1.1" ordered-float = "2.1.1"
itertools = "0.10" itertools = "0.10"
dirs = "4.0.0" dirs = "4.0.0"

2
crates/util/Cargo.toml
View file

@ -16,7 +16,7 @@ anyhow = "1.0.38"
backtrace = "0.3" backtrace = "0.3"
log = { version = "0.4.16", features = ["kv_unstable_serde"] } log = { version = "0.4.16", features = ["kv_unstable_serde"] }
lazy_static = "1.4.0" lazy_static = "1.4.0"
futures = "0.3" futures = { workspace = true }
isahc = "1.7" isahc = "1.7"
smol = "1.2.5" smol = "1.2.5"
url = "2.2" url = "2.2"

2
crates/workspace/Cargo.toml
View file

@ -38,7 +38,7 @@ util = { path = "../util" }
async-recursion = "1.0.0" async-recursion = "1.0.0"
bincode = "1.2.1" bincode = "1.2.1"
anyhow = "1.0.38" anyhow = "1.0.38"
futures = "0.3" futures = { workspace = true }
lazy_static = "1.4" lazy_static = "1.4"
env_logger = "0.9.1" env_logger = "0.9.1"
log = { version = "0.4.16", features = ["kv_unstable_serde"] } log = { version = "0.4.16", features = ["kv_unstable_serde"] }

2
crates/zed/Cargo.toml
View file

@ -76,7 +76,7 @@ chrono = "0.4"
ctor = "0.1.20" ctor = "0.1.20"
easy-parallel = "3.1.0" easy-parallel = "3.1.0"
env_logger = "0.9" env_logger = "0.9"
futures = "0.3" futures = { workspace = true }
ignore = "0.4" ignore = "0.4"
image = "0.23" image = "0.23"
indexmap = "1.6.2" indexmap = "1.6.2"