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:
Tobias Decking 2024-03-19 03:33:20 +01:00 committed by GitHub
parent 0c82585ea2
commit 1e1fb21c81
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 45 deletions

49
Cargo.lock generated
View file

@ -2237,7 +2237,7 @@ dependencies = [
"pretty_assertions",
"project",
"prometheus",
"prost 0.8.0",
"prost",
"rand 0.8.5",
"release_channel",
"reqwest",
@ -5492,9 +5492,9 @@ dependencies = [
"hmac 0.12.1",
"jwt",
"log",
"prost 0.8.0",
"prost",
"prost-build",
"prost-types 0.8.0",
"prost-types",
"reqwest",
"serde",
"sha2 0.10.7",
@ -7201,16 +7201,6 @@ dependencies = [
"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]]
name = "prost"
version = "0.9.0"
@ -7218,7 +7208,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
dependencies = [
"bytes 1.5.0",
"prost-derive 0.9.0",
"prost-derive",
]
[[package]]
@ -7234,26 +7224,13 @@ dependencies = [
"log",
"multimap",
"petgraph",
"prost 0.9.0",
"prost-types 0.9.0",
"prost",
"prost-types",
"regex",
"tempfile",
"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]]
name = "prost-derive"
version = "0.9.0"
@ -7267,16 +7244,6 @@ dependencies = [
"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]]
name = "prost-types"
version = "0.9.0"
@ -7284,7 +7251,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
dependencies = [
"bytes 1.5.0",
"prost 0.9.0",
"prost",
]
[[package]]
@ -7890,7 +7857,7 @@ dependencies = [
"futures 0.3.28",
"gpui",
"parking_lot",
"prost 0.8.0",
"prost",
"prost-build",
"rand 0.8.5",
"rsa 0.4.0",

View file

@ -238,7 +238,9 @@ parking_lot = "0.12.1"
profiling = "1"
postage = { version = "0.5", features = ["futures-traits"] }
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 }
rand = "0.8.5"
refineable = { path = "./crates/refineable" }

View file

@ -20,13 +20,13 @@ hmac = "0.12"
jwt = "0.16"
log.workspace = true
prost.workspace = true
prost-types = "0.8"
prost-types.workspace = true
reqwest = "0.11"
serde.workspace = true
sha2.workspace = true
[build-dependencies]
prost-build = "0.9"
prost-build.workspace = true
[package.metadata.cargo-machete]
ignored = ["prost-types"]

View file

@ -35,7 +35,7 @@ util.workspace = true
zstd = "0.11"
[build-dependencies]
prost-build = "0.9"
prost-build.workspace = true
[dev-dependencies]
collections.workspace = true