diff --git a/Cargo.lock b/Cargo.lock index ec3bc45..15968be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "adler32" version = "1.2.0" @@ -155,7 +157,7 @@ dependencies = [ "async-stream 0.3.0", "async-trait", "bazelfe-protos", - "bytes", + "bytes 0.5.6", "clap", "ctrlc", "dashmap", @@ -167,8 +169,8 @@ dependencies = [ "nom", "pinky-swear", "pretty_env_logger", - "prost", - "prost-types", + "prost 0.6.1", + "prost-types 0.8.0", "rand", "regex", "tempfile", @@ -184,8 +186,8 @@ dependencies = [ name = "bazelfe-protos" version = "0.1.0" dependencies = [ - "prost", - "prost-types", + "prost 0.6.1", + "prost-types 0.8.0", "tonic", "tonic-build", ] @@ -214,6 +216,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + [[package]] name = "bzip2" version = "0.3.3" @@ -535,7 +543,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "futures-sink", @@ -578,7 +586,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "itoa", ] @@ -589,7 +597,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes", + "bytes 0.5.6", "http", ] @@ -620,7 +628,7 @@ version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", @@ -675,6 +683,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.6" @@ -1042,8 +1059,18 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212" dependencies = [ - "bytes", - "prost-derive", + "bytes 0.5.6", + "prost-derive 0.6.1", +] + +[[package]] +name = "prost" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" +dependencies = [ + "bytes 1.1.0", + "prost-derive 0.8.0", ] [[package]] @@ -1052,14 +1079,14 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26" dependencies = [ - "bytes", + "bytes 0.5.6", "heck", - "itertools", + "itertools 0.8.2", "log", "multimap", "petgraph", - "prost", - "prost-types", + "prost 0.6.1", + "prost-types 0.6.1", "tempfile", "which", ] @@ -1071,7 +1098,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72" dependencies = [ "anyhow", - "itertools", + "itertools 0.8.2", + "proc-macro2", + "quote", + "syn", +] + +[[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.3", "proc-macro2", "quote", "syn", @@ -1083,8 +1123,18 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa" dependencies = [ - "bytes", - "prost", + "bytes 0.5.6", + "prost 0.6.1", +] + +[[package]] +name = "prost-types" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" +dependencies = [ + "bytes 1.1.0", + "prost 0.8.0", ] [[package]] @@ -1398,7 +1448,7 @@ version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "iovec", @@ -1445,7 +1495,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-core", "futures-sink", "log", @@ -1462,7 +1512,7 @@ dependencies = [ "async-stream 0.2.1", "async-trait", "base64", - "bytes", + "bytes 0.5.6", "futures-core", "futures-util", "http", @@ -1470,8 +1520,8 @@ dependencies = [ "hyper", "percent-encoding", "pin-project", - "prost", - "prost-derive", + "prost 0.6.1", + "prost-derive 0.6.1", "tokio", "tokio-rustls", "tokio-util", diff --git a/bazelfe-core/Cargo.toml b/bazelfe-core/Cargo.toml index 912951f..8c290ce 100644 --- a/bazelfe-core/Cargo.toml +++ b/bazelfe-core/Cargo.toml @@ -19,7 +19,7 @@ tonic = { version = "0.3.1", features = ["tls"] } prost = "0.6" tokio = { version = "0.2", features = ["rt-threaded", "time", "stream", "fs", "macros", "uds", "io-util", "process", "io-std"] } # Required for wellknown types -prost-types = "0.6" +prost-types = "0.8" pretty_env_logger = "0.4" log = "0.4" async-stream = "0.3.0" diff --git a/bazelfe-protos/Cargo.toml b/bazelfe-protos/Cargo.toml index 03402a6..c0d73ca 100644 --- a/bazelfe-protos/Cargo.toml +++ b/bazelfe-protos/Cargo.toml @@ -10,7 +10,7 @@ license = "Apache-2.0" tonic = { version = "0.3.1", features = ["tls"] } prost = "0.6" # Required for wellknown types -prost-types = "0.6" +prost-types = "0.8" [build-dependencies] tonic-build = { version = "0.2.0", features = ["prost"] }