mirror of
https://github.com/zed-industries/zed.git
synced 2024-09-18 18:08:07 +03:00
Merge prost dependecies (#9522)
This patch puts the prost, prost-build, and prost-types dependencies together and unifies their version. This improves organization a bit in addition to improving build time slightly, since a redundant version of prost is now removed. The dependencies are _not_ updated to the newest versions, because the newest versions add a dependency on the `protoc` application, which is not provided by cargo and thus breaks the building process.
This commit is contained in:
parent
0c82585ea2
commit
1e1fb21c81
49
Cargo.lock
generated
49
Cargo.lock
generated
@ -2237,7 +2237,7 @@ dependencies = [
|
|||||||
"pretty_assertions",
|
"pretty_assertions",
|
||||||
"project",
|
"project",
|
||||||
"prometheus",
|
"prometheus",
|
||||||
"prost 0.8.0",
|
"prost",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"release_channel",
|
"release_channel",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
@ -5492,9 +5492,9 @@ dependencies = [
|
|||||||
"hmac 0.12.1",
|
"hmac 0.12.1",
|
||||||
"jwt",
|
"jwt",
|
||||||
"log",
|
"log",
|
||||||
"prost 0.8.0",
|
"prost",
|
||||||
"prost-build",
|
"prost-build",
|
||||||
"prost-types 0.8.0",
|
"prost-types",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"serde",
|
"serde",
|
||||||
"sha2 0.10.7",
|
"sha2 0.10.7",
|
||||||
@ -7201,16 +7201,6 @@ dependencies = [
|
|||||||
"thiserror",
|
"thiserror",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "prost"
|
|
||||||
version = "0.8.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"
|
|
||||||
dependencies = [
|
|
||||||
"bytes 1.5.0",
|
|
||||||
"prost-derive 0.8.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "prost"
|
name = "prost"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
@ -7218,7 +7208,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
|
checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes 1.5.0",
|
"bytes 1.5.0",
|
||||||
"prost-derive 0.9.0",
|
"prost-derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -7234,26 +7224,13 @@ dependencies = [
|
|||||||
"log",
|
"log",
|
||||||
"multimap",
|
"multimap",
|
||||||
"petgraph",
|
"petgraph",
|
||||||
"prost 0.9.0",
|
"prost",
|
||||||
"prost-types 0.9.0",
|
"prost-types",
|
||||||
"regex",
|
"regex",
|
||||||
"tempfile",
|
"tempfile",
|
||||||
"which 4.4.2",
|
"which 4.4.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "prost-derive"
|
|
||||||
version = "0.8.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"
|
|
||||||
dependencies = [
|
|
||||||
"anyhow",
|
|
||||||
"itertools 0.10.5",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 1.0.109",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "prost-derive"
|
name = "prost-derive"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
@ -7267,16 +7244,6 @@ dependencies = [
|
|||||||
"syn 1.0.109",
|
"syn 1.0.109",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "prost-types"
|
|
||||||
version = "0.8.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b"
|
|
||||||
dependencies = [
|
|
||||||
"bytes 1.5.0",
|
|
||||||
"prost 0.8.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "prost-types"
|
name = "prost-types"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
@ -7284,7 +7251,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
|
checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes 1.5.0",
|
"bytes 1.5.0",
|
||||||
"prost 0.9.0",
|
"prost",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -7890,7 +7857,7 @@ dependencies = [
|
|||||||
"futures 0.3.28",
|
"futures 0.3.28",
|
||||||
"gpui",
|
"gpui",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"prost 0.8.0",
|
"prost",
|
||||||
"prost-build",
|
"prost-build",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"rsa 0.4.0",
|
"rsa 0.4.0",
|
||||||
|
@ -238,7 +238,9 @@ parking_lot = "0.12.1"
|
|||||||
profiling = "1"
|
profiling = "1"
|
||||||
postage = { version = "0.5", features = ["futures-traits"] }
|
postage = { version = "0.5", features = ["futures-traits"] }
|
||||||
pretty_assertions = "1.3.0"
|
pretty_assertions = "1.3.0"
|
||||||
prost = "0.8"
|
prost = "0.9"
|
||||||
|
prost-build = "0.9"
|
||||||
|
prost-types = "0.9"
|
||||||
pulldown-cmark = { version = "0.10.0", default-features = false }
|
pulldown-cmark = { version = "0.10.0", default-features = false }
|
||||||
rand = "0.8.5"
|
rand = "0.8.5"
|
||||||
refineable = { path = "./crates/refineable" }
|
refineable = { path = "./crates/refineable" }
|
||||||
|
@ -20,13 +20,13 @@ hmac = "0.12"
|
|||||||
jwt = "0.16"
|
jwt = "0.16"
|
||||||
log.workspace = true
|
log.workspace = true
|
||||||
prost.workspace = true
|
prost.workspace = true
|
||||||
prost-types = "0.8"
|
prost-types.workspace = true
|
||||||
reqwest = "0.11"
|
reqwest = "0.11"
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
sha2.workspace = true
|
sha2.workspace = true
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
prost-build = "0.9"
|
prost-build.workspace = true
|
||||||
|
|
||||||
[package.metadata.cargo-machete]
|
[package.metadata.cargo-machete]
|
||||||
ignored = ["prost-types"]
|
ignored = ["prost-types"]
|
||||||
|
@ -35,7 +35,7 @@ util.workspace = true
|
|||||||
zstd = "0.11"
|
zstd = "0.11"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
prost-build = "0.9"
|
prost-build.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
collections.workspace = true
|
collections.workspace = true
|
||||||
|
Loading…
Reference in New Issue
Block a user