From 1e1fb21c8120c59093bfe57eda7478f4349f5a14 Mon Sep 17 00:00:00 2001
From: Tobias Decking <Tobias.Decking@gmail.com>
Date: Tue, 19 Mar 2024 03:33:20 +0100
Subject: [PATCH] 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.
---
 Cargo.lock                        | 49 +++++--------------------------
 Cargo.toml                        |  4 ++-
 crates/live_kit_server/Cargo.toml |  4 +--
 crates/rpc/Cargo.toml             |  2 +-
 4 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a6b98d0dac..09c6157b19 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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",
diff --git a/Cargo.toml b/Cargo.toml
index 77a514ea07..421485ee48 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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" }
diff --git a/crates/live_kit_server/Cargo.toml b/crates/live_kit_server/Cargo.toml
index bdac22a85c..8d73f503a1 100644
--- a/crates/live_kit_server/Cargo.toml
+++ b/crates/live_kit_server/Cargo.toml
@@ -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"]
diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml
index be37140e60..f41be65de1 100644
--- a/crates/rpc/Cargo.toml
+++ b/crates/rpc/Cargo.toml
@@ -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