Skip to content

Commit

Permalink
[protobuf] upgrade to protobuf 2.7
Browse files Browse the repository at this point in the history
upgraded protobuf to 2.7. it now produces files with the right
clippy lint exception, so we can remove "renamed_and_removed_lints"
  • Loading branch information
Gerardo Di Giacomo authored and calibra-opensource committed Jul 8, 2019
1 parent bef5f17 commit fdbda1d
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 19 deletions.
2 changes: 1 addition & 1 deletion admission_control/admission_control_proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion admission_control/admission_control_service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion benchmark/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion client/libra_wallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion common/debug_interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion common/grpcio-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions common/proto_conv/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }

Expand Down
2 changes: 1 addition & 1 deletion consensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion crypto/secret_service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion execution/execution_proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion language/vm/vm_runtime/vm_runtime_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion mempool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion scripts/clippy.args
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion storage/storage_proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion storage/storage_service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down

0 comments on commit fdbda1d

Please sign in to comment.