tikv · qwandor · Dec 1, 2023 · Dec 1, 2023 · Dec 1, 2023 · BusyJay
diff --git a/grpc-sys/build.rs b/grpc-sys/build.rs
@@ -300,7 +300,7 @@ fn build_grpc(cc: &mut cc::Build, library: &str) {
 
 fn figure_systemd_path(build_dir: &str) {
     let path = format!("{build_dir}/CMakeCache.txt");
-    let f = BufReader::new(std::fs::File::open(&path).unwrap());
+    let f = BufReader::new(std::fs::File::open(path).unwrap());
     let mut libdir: Option<String> = None;
     let mut libname: Option<String> = None;
     for l in f.lines() {

diff --git a/grpc-sys/src/lib.rs b/grpc-sys/src/lib.rs
@@ -10,4 +10,3 @@ mod bindings {
 mod grpc_wrap;
 
 pub use bindings::*;
-pub use grpc_wrap::*;
diff --git a/health/src/proto.rs b/health/src/proto.rs
@@ -22,7 +22,6 @@ mod protobuf_v3 {
 #[cfg(feature = "protobuf-codec")]
 mod reexports {
     pub use super::protobuf::health::*;
-    pub use super::protobuf::health_grpc::*;
 }
 #[cfg(feature = "protobufv3-codec")]
 mod reexports {

diff --git a/health/src/proto/protobuf_v3/health.rs b/health/src/proto/protobuf_v3/health.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 3.2.0. Do not edit
+// This file is generated by rust-protobuf 3.3.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -22,10 +22,10 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_2_0;
+const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_3_0;
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:grpc.health.v1.HealthCheckRequest)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct HealthCheckRequest {
     // message fields
     // @@protoc_insertion_point(field:grpc.health.v1.HealthCheckRequest.service)
@@ -146,8 +146,8 @@ impl ::protobufv3::reflect::ProtobufValue for HealthCheckRequest {
     type RuntimeType = ::protobufv3::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:grpc.health.v1.HealthCheckResponse)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct HealthCheckResponse {
     // message fields
     // @@protoc_insertion_point(field:grpc.health.v1.HealthCheckResponse.status)
@@ -300,6 +300,16 @@ pub mod health_check_response {
             }
         }
 
+        fn from_str(str: &str) -> ::std::option::Option<ServingStatus> {
+            match str {
+                "Unknown" => ::std::option::Option::Some(ServingStatus::Unknown),
+                "Serving" => ::std::option::Option::Some(ServingStatus::Serving),
+                "NotServing" => ::std::option::Option::Some(ServingStatus::NotServing),
+                "ServiceUnknown" => ::std::option::Option::Some(ServingStatus::ServiceUnknown),
+                _ => ::std::option::Option::None
+            }
+        }
+
         const VALUES: &'static [ServingStatus] = &[
             ServingStatus::Unknown,
             ServingStatus::Serving,

diff --git a/interop/src/client.rs b/interop/src/client.rs
@@ -80,7 +80,7 @@ impl Client {
 
     pub async fn server_streaming(&self) -> grpcio::Result<()> {
         print!("testing server streaming ... ");
-        let sizes = vec![31415, 9, 2653, 58979];
+        let sizes = [31415, 9, 2653, 58979];
         let req = StreamingOutputCallRequest {
             response_parameters: sizes
                 .iter()

diff --git a/proto/src/proto/protobuf_v3/example/helloworld.rs b/proto/src/proto/protobuf_v3/example/helloworld.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 3.2.0. Do not edit
+// This file is generated by rust-protobuf 3.3.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -22,10 +22,10 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_2_0;
+const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_3_0;
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:helloworld.HelloRequest)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct HelloRequest {
     // message fields
     // @@protoc_insertion_point(field:helloworld.HelloRequest.name)
@@ -146,8 +146,8 @@ impl ::protobufv3::reflect::ProtobufValue for HelloRequest {
     type RuntimeType = ::protobufv3::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:helloworld.HelloReply)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct HelloReply {
     // message fields
     // @@protoc_insertion_point(field:helloworld.HelloReply.message)

diff --git a/proto/src/proto/protobuf_v3/example/route_guide.rs b/proto/src/proto/protobuf_v3/example/route_guide.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 3.2.0. Do not edit
+// This file is generated by rust-protobuf 3.3.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -22,10 +22,10 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_2_0;
+const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_3_0;
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:routeguide.Point)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Point {
     // message fields
     // @@protoc_insertion_point(field:routeguide.Point.latitude)
@@ -164,8 +164,8 @@ impl ::protobufv3::reflect::ProtobufValue for Point {
     type RuntimeType = ::protobufv3::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:routeguide.Rectangle)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Rectangle {
     // message fields
     // @@protoc_insertion_point(field:routeguide.Rectangle.lo)
@@ -306,8 +306,8 @@ impl ::protobufv3::reflect::ProtobufValue for Rectangle {
     type RuntimeType = ::protobufv3::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:routeguide.Feature)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Feature {
     // message fields
     // @@protoc_insertion_point(field:routeguide.Feature.name)
@@ -447,8 +447,8 @@ impl ::protobufv3::reflect::ProtobufValue for Feature {
     type RuntimeType = ::protobufv3::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:routeguide.RouteNote)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct RouteNote {
     // message fields
     // @@protoc_insertion_point(field:routeguide.RouteNote.location)
@@ -588,8 +588,8 @@ impl ::protobufv3::reflect::ProtobufValue for RouteNote {
     type RuntimeType = ::protobufv3::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:routeguide.RouteSummary)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct RouteSummary {
     // message fields
     // @@protoc_insertion_point(field:routeguide.RouteSummary.point_count)

diff --git a/proto/src/proto/protobuf_v3/google/rpc/status.rs b/proto/src/proto/protobuf_v3/google/rpc/status.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 3.2.0. Do not edit
+// This file is generated by rust-protobuf 3.3.0. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -22,10 +22,10 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_2_0;
+const _PROTOBUF_VERSION_CHECK: () = ::protobufv3::VERSION_3_3_0;
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.rpc.Status)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Status {
     // message fields
     // @@protoc_insertion_point(field:google.rpc.Status.code)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,3 @@ mod bindings {
		mod grpc_wrap;

		pub use bindings::*;
		pub use grpc_wrap::*;
Copy link Member BusyJay Jan 3, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Why delete this? Copy link Contributor Author qwandor Jan 9, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. It generates an "unused import" warning building with the nightly toolchain, which fails CI. The `grpc_wrap` module has no public members, so this use statement is actually a no-op. (`grpc_wrap` does add implementations to other types, but they don't need importing as they aren't part of its namespace.)