Merge branch 'master' into no-bindgen

Author: BusyJay

.github/workflows/ci.yml

@@ -95,6 +95,8 @@ jobs:
   Win:
     name: Windows
     runs-on: windows-latest
+    env:
+      LIBCLANG_PATH: 'C:\Program Files\LLVM\bin'
     steps:
     - uses: actions/checkout@v2
     - run: choco install -y llvm

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.7.1 - 2020-12-18
+
+- Allow CXX environment variable to override g++ for musl build (#500)
+- Add user-defined checker for server side (#502)
+
 # 0.7.0 - 2020-11-02
 
 - Add blocking callback to `EnvBuilder` (#474)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grpcio"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2018"
 authors = ["The TiKV Project Developers"]
 license = "Apache-2.0"

grpc-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grpcio-sys"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["The TiKV Project Developers"]
 license = "Apache-2.0"
 keywords = ["grpc", "bindings"]
@@ -69,5 +69,5 @@ cmake = "0.1"
 pkg-config = "0.3"
 walkdir = "2.2.9"
 # Because of rust-lang/cargo#5237, bindgen should not be upgraded util a minor or major release.
-bindgen = { version = "0.51.0", default-features = false, optional = true }
+bindgen = { version = "0.56.0", default-features = false, optional = true, features = ["runtime"] }
 boringssl-src = "0.1.0"

grpc-sys/bindings/aarch64-unknown-linux-gnu-bindings.rs

@@ -1,5 +1,3 @@
-/* automatically generated by rust-bindgen */
-
 pub const GRPC_ARES: u32 = 1;
 pub const GRPC_IF_NAMETOINDEX: u32 = 1;
 pub const GRPC_ALLOW_EXCEPTIONS: u32 = 1;
@@ -170,7 +168,7 @@ pub const GRPC_METADATA_CREDENTIALS_PLUGIN_SYNC_MAX: u32 = 4;
 #[repr(u32)]
 #[doc = " The various compression algorithms supported by gRPC (not sorted by"]
 #[doc = " compression level)"]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_compression_algorithm {
     GRPC_COMPRESS_NONE = 0,
     GRPC_COMPRESS_DEFLATE = 1,
@@ -183,7 +181,7 @@ pub enum grpc_compression_algorithm {
 #[doc = " encodings to request compression in an abstract way. The level-algorithm"]
 #[doc = " mapping is performed internally and depends on the peer's supported"]
 #[doc = " compression algorithms."]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_compression_level {
     GRPC_COMPRESS_LEVEL_NONE = 0,
     GRPC_COMPRESS_LEVEL_LOW = 1,
@@ -300,7 +298,7 @@ impl ::std::fmt::Debug for grpc_slice_buffer {
 }
 #[repr(u32)]
 #[doc = " The clocks we support."]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum gpr_clock_type {
     #[doc = " Monotonic clock. Epoch undefined. Always moves forwards."]
     GPR_CLOCK_MONOTONIC = 0,
@@ -535,7 +533,7 @@ extern "C" {
     pub fn grpc_slice_split_tail(s: *mut grpc_slice, split: usize) -> grpc_slice;
 }
 #[repr(u32)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_slice_ref_whom {
     GRPC_SLICE_REF_TAIL = 1,
     GRPC_SLICE_REF_HEAD = 2,
@@ -681,7 +679,7 @@ extern "C" {
     ) -> ::std::os::raw::c_int;
 }
 pub mod grpc_status_code {
-    pub type Type = i32;
+    pub type Type = ::std::os::raw::c_int;
     #[doc = " Not an error; returned on success"]
     pub const GRPC_STATUS_OK: Type = 0;
     #[doc = " The operation was cancelled (typically by the caller)."]
@@ -788,7 +786,7 @@ pub mod grpc_status_code {
     pub const GRPC_STATUS__DO_NOT_USE: Type = -1;
 }
 #[repr(u32)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_byte_buffer_type {
     GRPC_BB_RAW = 0,
 }
@@ -873,7 +871,7 @@ pub struct grpc_socket_factory {
 }
 #[repr(u32)]
 #[doc = " Type specifier for grpc_arg"]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_arg_type {
     GRPC_ARG_STRING = 0,
     GRPC_ARG_INTEGER = 1,
@@ -967,7 +965,7 @@ pub struct grpc_channel_args {
 #[doc = "particular operation, the grpc_call_error returned will be GRPC_CALL_OK."]
 #[doc = "Receiving any other value listed here is an indication of a bug in the"]
 #[doc = "caller."]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_call_error {
     #[doc = " everything went ok"]
     GRPC_CALL_OK = 0,
@@ -1034,7 +1032,7 @@ impl ::std::fmt::Debug for grpc_metadata {
 }
 #[repr(u32)]
 #[doc = " The type of completion (for grpc_event)"]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_completion_type {
     #[doc = " Shutting down"]
     GRPC_QUEUE_SHUTDOWN = 0,
@@ -1084,7 +1082,7 @@ impl ::std::fmt::Debug for grpc_call_details {
     }
 }
 #[repr(u32)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_op_type {
     #[doc = " Send initial metadata: one and only one instance MUST be sent for each"]
     #[doc = "call, unless the call was cancelled - in which case this can be skipped."]
@@ -1274,7 +1272,7 @@ pub struct grpc_resource_quota {
 #[doc = "grpc_completion_queue_pluck() are called on the completion queue (unless the"]
 #[doc = "grpc_cq_polling_type is GRPC_CQ_NON_POLLING) and hence it is very important"]
 #[doc = "to actively call these APIs"]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_cq_polling_type {
     #[doc = " The completion queue will have an associated pollset and there is no"]
     #[doc = "restriction on the type of file descriptors the pollset may contain"]
@@ -1291,7 +1289,7 @@ pub enum grpc_cq_polling_type {
 }
 #[repr(u32)]
 #[doc = " Specifies the type of APIs to use to pop events from the completion queue"]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_cq_completion_type {
     #[doc = " Events are popped out by calling grpc_completion_queue_next() API ONLY"]
     GRPC_CQ_NEXT = 0,
@@ -1518,7 +1516,7 @@ extern "C" {
 }
 #[repr(u32)]
 #[doc = " Connectivity state of a channel."]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_connectivity_state {
     #[doc = " channel is idle"]
     GRPC_CHANNEL_IDLE = 0,
@@ -2034,7 +2032,7 @@ extern "C" {
 }
 #[repr(u32)]
 #[doc = " How to handle payloads for a registered method"]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_server_register_method_payload_handling {
     #[doc = " Don't try to read the payload"]
     GRPC_SRM_PAYLOAD_NONE = 0,
@@ -2267,7 +2265,7 @@ extern "C" {
 }
 #[repr(u32)]
 #[doc = " Results for the SSL roots override callback."]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_ssl_roots_override_result {
     GRPC_SSL_ROOTS_OVERRIDE_OK = 0,
     GRPC_SSL_ROOTS_OVERRIDE_FAIL_PERMANENTLY = 1,
@@ -2276,14 +2274,14 @@ pub enum grpc_ssl_roots_override_result {
 }
 #[repr(u32)]
 #[doc = " Callback results for dynamically loading a SSL certificate config."]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_ssl_certificate_config_reload_status {
     GRPC_SSL_CERTIFICATE_CONFIG_RELOAD_UNCHANGED = 0,
     GRPC_SSL_CERTIFICATE_CONFIG_RELOAD_NEW = 1,
     GRPC_SSL_CERTIFICATE_CONFIG_RELOAD_FAIL = 2,
 }
 #[repr(u32)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_ssl_client_certificate_request_type {
     #[doc = " Server does not request client certificate."]
     #[doc = "The certificate presented by the client is not checked by the server at"]
@@ -2340,14 +2338,14 @@ impl grpc_security_level {
         grpc_security_level::GRPC_PRIVACY_AND_INTEGRITY;
 }
 #[repr(u32)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_security_level {
     GRPC_SECURITY_MIN = 0,
     GRPC_INTEGRITY_ONLY = 1,
     GRPC_PRIVACY_AND_INTEGRITY = 2,
 }
 #[repr(u32)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_tls_server_verification_option {
     #[doc = " Default option: performs server certificate verification and hostname"]
     #[doc = "verification."]
@@ -2364,14 +2362,14 @@ pub enum grpc_tls_server_verification_option {
 #[repr(u32)]
 #[doc = " Type of local connections for which local channel/server credentials will be"]
 #[doc = " applied. It supports UDS and local TCP connections."]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_local_connect_type {
     UDS = 0,
     LOCAL_TCP = 1,
 }
 #[repr(u32)]
 #[doc = " The TLS versions that are supported by the SSL stack."]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum grpc_tls_version {
     TLS1_2 = 0,
     TLS1_3 = 1,
@@ -3488,7 +3486,7 @@ extern "C" {
 #[repr(u32)]
 #[doc = " The severity of a log message - use the #defines below when calling into"]
 #[doc = "gpr_log to additionally supply file and line data"]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum gpr_log_severity {
     GPR_LOG_SEVERITY_DEBUG = 0,
     GPR_LOG_SEVERITY_INFO = 1,