From 3719a9ee235af59f156d7d47276e8c4be7280c51 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 30 Sep 2021 15:36:40 -0700
Subject: [PATCH] Use published prost crates

The previous version of prost didn't build on nightly rust.
---
 Cargo.lock      | 60 +++++++++++++------------------------------------
 zrpc/Cargo.toml |  4 ++--
 2 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 483cf758880de..57fb05322f619 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2587,15 +2587,6 @@ dependencies = [
  "waker-fn",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.10.1"
@@ -3627,35 +3618,27 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2"
+checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"
 dependencies = [
  "bytes 1.0.1",
- "prost-derive 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "prost"
-version = "0.7.0"
-source = "git+https://github.com/tokio-rs/prost?rev=6cf97ea422b09d98de34643c4dda2d4f8b7e23e6#6cf97ea422b09d98de34643c4dda2d4f8b7e23e6"
-dependencies = [
- "bytes 1.0.1",
- "prost-derive 0.7.0 (git+https://github.com/tokio-rs/prost?rev=6cf97ea422b09d98de34643c4dda2d4f8b7e23e6)",
+ "prost-derive",
 ]
 
 [[package]]
 name = "prost-build"
-version = "0.7.0"
-source = "git+https://github.com/tokio-rs/prost?rev=6cf97ea422b09d98de34643c4dda2d4f8b7e23e6#6cf97ea422b09d98de34643c4dda2d4f8b7e23e6"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603"
 dependencies = [
  "bytes 1.0.1",
  "heck",
- "itertools 0.10.1",
+ "itertools",
  "log",
  "multimap",
  "petgraph",
- "prost 0.7.0 (git+https://github.com/tokio-rs/prost?rev=6cf97ea422b09d98de34643c4dda2d4f8b7e23e6)",
+ "prost",
  "prost-types",
  "tempfile",
  "which 4.1.0",
@@ -3663,24 +3646,12 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
+checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"
 dependencies = [
  "anyhow",
- "itertools 0.9.0",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.7.0"
-source = "git+https://github.com/tokio-rs/prost?rev=6cf97ea422b09d98de34643c4dda2d4f8b7e23e6#6cf97ea422b09d98de34643c4dda2d4f8b7e23e6"
-dependencies = [
- "anyhow",
- "itertools 0.10.1",
+ "itertools",
  "proc-macro2",
  "quote",
  "syn",
@@ -3688,11 +3659,12 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.7.0"
-source = "git+https://github.com/tokio-rs/prost?rev=6cf97ea422b09d98de34643c4dda2d4f8b7e23e6#6cf97ea422b09d98de34643c4dda2d4f8b7e23e6"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b"
 dependencies = [
  "bytes 1.0.1",
- "prost 0.7.0 (git+https://github.com/tokio-rs/prost?rev=6cf97ea422b09d98de34643c4dda2d4f8b7e23e6)",
+ "prost",
 ]
 
 [[package]]
@@ -6042,7 +6014,7 @@ dependencies = [
  "log",
  "parking_lot",
  "postage",
- "prost 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "prost",
  "prost-build",
  "rand 0.8.3",
  "rsa",
diff --git a/zrpc/Cargo.toml b/zrpc/Cargo.toml
index ee1b1433daad1..96f3604e76c76 100644
--- a/zrpc/Cargo.toml
+++ b/zrpc/Cargo.toml
@@ -16,14 +16,14 @@ futures = "0.3"
 log = "0.4"
 parking_lot = "0.11.1"
 postage = { version = "0.4.1", features = ["futures-traits"] }
-prost = "0.7"
+prost = "0.8"
 rand = "0.8"
 rsa = "0.4"
 serde = { version = "1", features = ["derive"] }
 zstd = "0.9"
 
 [build-dependencies]
-prost-build = { git = "https://github.com/tokio-rs/prost", rev = "6cf97ea422b09d98de34643c4dda2d4f8b7e23e6" }
+prost-build = "0.8"
 
 [dev-dependencies]
 smol = "1.2.5"