From fdbda1dc4e4e3c3019e4ea9ed0db852fc586efdf Mon Sep 17 00:00:00 2001 From: Gerardo Di Giacomo Date: Wed, 3 Jul 2019 13:34:03 -0700 Subject: [PATCH] [protobuf] upgrade to protobuf 2.7 upgraded protobuf to 2.7. it now produces files with the right clippy lint exception, so we can remove "renamed_and_removed_lints" --- admission_control/admission_control_proto/Cargo.toml | 2 +- admission_control/admission_control_service/Cargo.toml | 2 +- benchmark/Cargo.toml | 2 +- client/Cargo.toml | 2 +- client/libra_wallet/Cargo.toml | 2 +- common/debug_interface/Cargo.toml | 2 +- common/grpcio-client/Cargo.toml | 2 +- common/proto_conv/Cargo.toml | 4 ++-- consensus/Cargo.toml | 2 +- crypto/secret_service/Cargo.toml | 2 +- execution/execution_proto/Cargo.toml | 2 +- language/vm/vm_runtime/vm_runtime_tests/Cargo.toml | 2 +- mempool/Cargo.toml | 2 +- network/Cargo.toml | 2 +- scripts/clippy.args | 1 - storage/storage_proto/Cargo.toml | 2 +- storage/storage_service/Cargo.toml | 2 +- types/Cargo.toml | 2 +- 18 files changed, 18 insertions(+), 19 deletions(-) diff --git a/admission_control/admission_control_proto/Cargo.toml b/admission_control/admission_control_proto/Cargo.toml index 455fa4e9248d..235d8858b2d9 100644 --- a/admission_control/admission_control_proto/Cargo.toml +++ b/admission_control/admission_control_proto/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" futures = "0.1.25" futures03 = { version = "=0.3.0-alpha.16", package = "futures-preview" } grpcio = "0.4.3" -protobuf = "2.6" +protobuf = "2.7" failure = { package = "failure_ext", path = "../../common/failure_ext" } logger = { path = "../../common/logger" } diff --git a/admission_control/admission_control_service/Cargo.toml b/admission_control/admission_control_service/Cargo.toml index be012b1aec28..08f9ec91f117 100644 --- a/admission_control/admission_control_service/Cargo.toml +++ b/admission_control/admission_control_service/Cargo.toml @@ -11,7 +11,7 @@ futures = "0.1.25" futures03 = { version = "=0.3.0-alpha.16", package = "futures-preview" } grpcio = "0.4.3" lazy_static = "1.3.0" -protobuf = "2.6" +protobuf = "2.7" admission_control_proto = { path = "../admission_control_proto" } config = { path = "../../config" } diff --git a/benchmark/Cargo.toml b/benchmark/Cargo.toml index 93c06c66a9f9..b3f202284015 100644 --- a/benchmark/Cargo.toml +++ b/benchmark/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] futures = "0.1.23" itertools = "0.8.0" -protobuf = "2.6" +protobuf = "2.7" grpcio = "0.4" admission_control_proto = { path = "../admission_control/admission_control_proto" } diff --git a/client/Cargo.toml b/client/Cargo.toml index ce8267c78948..e88d71c13f89 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -15,7 +15,7 @@ hex = "0.3.2" hyper = "0.12" itertools = "0.8.0" proptest = "0.9.2" -protobuf = "2.6" +protobuf = "2.7" rand = "0.6.5" rustyline = "4.1.0" tokio = "0.1.16" diff --git a/client/libra_wallet/Cargo.toml b/client/libra_wallet/Cargo.toml index 93ba790647da..9451f286e258 100644 --- a/client/libra_wallet/Cargo.toml +++ b/client/libra_wallet/Cargo.toml @@ -36,7 +36,7 @@ serde = "1" serde_derive = "1" serde_json = "1.0.31" tiny-keccak = "1.4.2" -protobuf = "2.6" +protobuf = "2.7" sha3 = "0.8.2" [dev-dependencies] diff --git a/common/debug_interface/Cargo.toml b/common/debug_interface/Cargo.toml index d444c98b9a96..f40974e03cd4 100644 --- a/common/debug_interface/Cargo.toml +++ b/common/debug_interface/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] grpcio = "0.4.3" futures = "0.1.23" -protobuf = "2.6" +protobuf = "2.7" failure = { package = "failure_ext", path = "../failure_ext" } jemalloc = { path = "../jemalloc" } diff --git a/common/grpcio-client/Cargo.toml b/common/grpcio-client/Cargo.toml index e0ef6c07f1e6..198352766341 100644 --- a/common/grpcio-client/Cargo.toml +++ b/common/grpcio-client/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] mktemp = "0.3" -protobuf = "2.6" +protobuf = "2.7" protobuf-codegen = "2.*" protoc = "2.*" protoc-grpcio = "1.0.1" diff --git a/common/proto_conv/Cargo.toml b/common/proto_conv/Cargo.toml index 9c72f2111481..4c8984449486 100644 --- a/common/proto_conv/Cargo.toml +++ b/common/proto_conv/Cargo.toml @@ -7,14 +7,14 @@ publish = false edition = "2018" [dependencies] -protobuf = "2.6" +protobuf = "2.7" failure = { path = "../failure_ext", package = "failure_ext" } proto_conv_derive = { path = "proto_conv_derive", optional = true } [dev-dependencies] proptest = "0.9.2" proptest-derive = "0.1.0" -protobuf = "2.6" +protobuf = "2.7" proto_conv = { path = ".", features = ["derive"] } diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index b1342ba28a67..368d63b315a0 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -16,7 +16,7 @@ mirai-annotations = "0.1.0" num-traits = "0.2" num-derive = "0.2" proptest = "0.9" -protobuf = "2.6" +protobuf = "2.7" rand = "0.6.5" serde = { version = "1.0.87", features = ["derive"] } tokio = "0.1.11" diff --git a/crypto/secret_service/Cargo.toml b/crypto/secret_service/Cargo.toml index ae5e3c70c724..5eba7cd7d2d9 100644 --- a/crypto/secret_service/Cargo.toml +++ b/crypto/secret_service/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] futures = "0.1.25" grpcio = "0.4.3" -protobuf = "2.6" +protobuf = "2.7" config = { path = "../../config" } grpc_helpers = { path = "../../common/grpc_helpers"} diff --git a/execution/execution_proto/Cargo.toml b/execution/execution_proto/Cargo.toml index 442287a85107..15e37cc3e168 100644 --- a/execution/execution_proto/Cargo.toml +++ b/execution/execution_proto/Cargo.toml @@ -11,7 +11,7 @@ futures = "0.1.25" grpcio = "0.4.4" proptest = "0.9.2" proptest-derive = "0.1.0" -protobuf = "2.6" +protobuf = "2.7" crypto = { path = "../../crypto/legacy_crypto" } failure = { path = "../../common/failure_ext", package = "failure_ext" } diff --git a/language/vm/vm_runtime/vm_runtime_tests/Cargo.toml b/language/vm/vm_runtime/vm_runtime_tests/Cargo.toml index c88200d884ff..ebd68617872d 100644 --- a/language/vm/vm_runtime/vm_runtime_tests/Cargo.toml +++ b/language/vm/vm_runtime/vm_runtime_tests/Cargo.toml @@ -22,7 +22,7 @@ proptest = "0.9.3" proptest-derive = "0.1.1" assert_matches = "1.3.0" proptest_helpers = { path = "../../../../common/proptest_helpers" } -protobuf = "2.6" +protobuf = "2.7" proto_conv = { path = "../../../../common/proto_conv", features = ["derive"] } tiny-keccak = "1.4.2" vm_genesis = { path = "../../vm_genesis"} diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml index 503a3d15da02..c82340bc99eb 100644 --- a/mempool/Cargo.toml +++ b/mempool/Cargo.toml @@ -14,7 +14,7 @@ grpcio = "0.4.3" grpcio-sys = "0.4.4" lazy_static = "1.3.0" lru-cache = "0.1.1" -protobuf = "2.6" +protobuf = "2.7" tokio = "0.1.16" ttl_cache = "0.4.2" diff --git a/network/Cargo.toml b/network/Cargo.toml index 22218bf6e315..a32cd8a6da8f 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -13,7 +13,7 @@ futures = { version = "=0.3.0-alpha.16", package = "futures-preview", features = lazy_static = "1.3.0" parity-multiaddr = "0.4.0" pin-utils = "=0.1.0-alpha.4" -protobuf = { version = "2.6", features = ["with-bytes"] } +protobuf = { version = "2.7", features = ["with-bytes"] } rand = "0.6.5" tokio = "0.1.16" tokio-timer = "0.2.10" diff --git a/scripts/clippy.args b/scripts/clippy.args index 08404192c63f..4769e5b69940 100644 --- a/scripts/clippy.args +++ b/scripts/clippy.args @@ -3,7 +3,6 @@ # Allowed lints allowed_lints=( - "-A" "renamed_and_removed_lints" "-A" "clippy::match_bool" "-A" "clippy::get_unwrap" "-A" "clippy::new_without_default" diff --git a/storage/storage_proto/Cargo.toml b/storage/storage_proto/Cargo.toml index 5a2de0cdf965..075d9a085bee 100644 --- a/storage/storage_proto/Cargo.toml +++ b/storage/storage_proto/Cargo.toml @@ -11,7 +11,7 @@ futures = "0.1.25" grpcio = "0.4.4" proptest = "0.9.2" proptest-derive = "0.1.0" -protobuf = "2.6" +protobuf = "2.7" crypto = { path = "../../crypto/legacy_crypto" } failure = { path = "../../common/failure_ext", package = "failure_ext" } diff --git a/storage/storage_service/Cargo.toml b/storage/storage_service/Cargo.toml index 358fe18d113c..57c282bd23a7 100644 --- a/storage/storage_service/Cargo.toml +++ b/storage/storage_service/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] futures = { version = "0.3.0-alpha.13", package = "futures-preview", features = ["compat"] } grpcio = "0.4.4" -protobuf = "2.6" +protobuf = "2.7" canonical_serialization = { path = "../../common/canonical_serialization" } config = { path = "../../config" } diff --git a/types/Cargo.toml b/types/Cargo.toml index 02ba89dc1035..8671071757b3 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -16,7 +16,7 @@ itertools = "0.8.0" lazy_static = "1.3.0" proptest = "0.9" proptest-derive = "0.1.0" -protobuf = "2.6" +protobuf = "2.7" radix_trie = "0.1.3" rand = "0.6.5" serde = { version = "1.0.89", features = ["derive"] }