Update prost to version 0.13 (#651)

Signed-off-by: Ionut Slaveanu <[email protected]>

Author: ionut-slaveanu

Cargo.toml

@@ -23,7 +23,7 @@ futures-executor = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["std", "sink"] }
 protobuf = { version = "2.0", optional = true }
 protobufv3 = { package = "protobuf", version = "3.2", optional = true }
-prost = { version = "0.12", optional = true }
+prost = { version = "0.13", optional = true }
 bytes = { version = "1.0", optional = true }
 log = "0.4"
 parking_lot = "0.12"

compiler/Cargo.toml

@@ -18,9 +18,9 @@ prost-codec = ["prost-build", "prost-types", "prost", "derive-new", "tempfile"]
 
 [dependencies]
 protobuf = { version = "2", optional = true }
-prost = { version = "0.12", optional = true }
-prost-build = { version = "0.12", optional = true }
-prost-types = { version = "0.12", optional = true }
+prost = { version = "0.13", optional = true }
+prost-build = { version = "0.13", optional = true }
+prost-types = { version = "0.13", optional = true }
 derive-new = { version = "0.6", optional = true }
 tempfile = { version = "3.0", optional = true }
 

compiler/src/codegen.rs

@@ -574,7 +574,7 @@ impl<'a> ServiceGen<'a> {
 
     fn write_client(&self, w: &mut CodeWriter) {
         w.write_line("#[derive(Clone)]");
-        w.pub_struct(&self.client_name(), |w| {
+        w.pub_struct(self.client_name(), |w| {
             // This can also be exposed by a method. But it may introduce a name conflict
             // between service definition and method name. Marking it public may put extra
             // restrict on compatability, but it should not be an issue.
@@ -583,7 +583,7 @@ impl<'a> ServiceGen<'a> {
 
         w.write_line("");
 
-        w.impl_self_block(&self.client_name(), |w| {
+        w.impl_self_block(self.client_name(), |w| {
             w.pub_fn("new(channel: ::grpcio::Channel) -> Self", |w| {
                 w.expr_block(&self.client_name(), |w| {
                     w.field_entry("client", "::grpcio::Client::new(channel)");

grpc-sys/bindings/bindings.rs

@@ -704,16 +704,6 @@ pub struct grpc_server {
 pub struct grpc_call {
     _unused: [u8; 0],
 }
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct grpc_socket_mutator {
-    _unused: [u8; 0],
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct grpc_socket_factory {
-    _unused: [u8; 0],
-}
 #[repr(u32)]
 #[doc = " Type specifier for grpc_arg"]
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]

grpc-sys/build.rs

@@ -464,6 +464,7 @@ fn bindgen_grpc(file_path: &Path) {
         .blocklist_type(r"gpr_mu")
         .blocklist_type(r"gpr_cv")
         .blocklist_type(r"gpr_once")
+        .blocklist_type(r"grpc_socket_.*")
         .constified_enum_module(r"grpc_status_code")
         .layout_tests(gen_tests)
         .default_enum_style(bindgen::EnumVariation::Rust {

health/Cargo.toml

@@ -22,7 +22,7 @@ prost-codec = ["grpcio/prost-codec", "prost"]
 futures-executor = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["std"] }
 grpcio = { path = "..", version = "0.13.0", default-features = false }
-prost = { version = "0.12", optional = true }
+prost = { version = "0.13", optional = true }
 protobuf = { version = "2", optional = true }
 protobufv3 = { package = "protobuf", version = "3.2", optional = true }
 log = "0.4"

health/src/lib.rs

@@ -31,6 +31,7 @@
 //! assert_eq!(statuss_resp.status, ServingStatus::Serving);
 //! ```
 
+#[allow(renamed_and_removed_lints)]
 pub mod proto;
 mod service;
 

health/src/proto/prost/grpc.health.v1.rs

@@ -6,7 +6,7 @@ pub struct HealthCheckRequest {
     pub service: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct HealthCheckResponse {
     #[prost(enumeration = "health_check_response::ServingStatus", tag = "1")]
     pub status: i32,

health/src/proto/protobuf_v3/health.rs

@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 3.4.0. Do not edit
+// This file is generated by rust-protobuf 3.5.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -22,7 +22,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_4_0;
+const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_5_0;
 
 // @@protoc_insertion_point(message:grpc.health.v1.HealthCheckRequest)
 #[derive(PartialEq,Clone,Default,Debug)]

interop/tests/tests.rs

@@ -53,11 +53,9 @@ macro_rules! mk_test {
 mk_test!(empty_unary);
 mk_test!(large_unary);
 // FIXME(#305) Intermittent test.
-#[cfg(not(feature = "openssl"))]
 mk_test!(client_streaming);
 mk_test!(server_streaming);
 // FIXME(#306) Intermittent test.
-#[cfg(not(feature = "openssl"))]
 mk_test!(ping_pong);
 mk_test!(custom_metadata);
 mk_test!(empty_stream);