Skip to content

Commit

Permalink
Revert "*: bump 0.11.0 (tikv#586)"
Browse files Browse the repository at this point in the history
This reverts commit 49347cd.

Signed-off-by: Jay Lee <[email protected]>
  • Loading branch information
BusyJay committed Oct 24, 2022
1 parent 3671236 commit f2a52ae
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 15 deletions.
4 changes: 0 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# 0.11.0 - 2022-09-10

- Update prost to 0.10 (#582)

# 0.10.3 - 2022-06-27

- Add support for GRPC_ARG_ENABLE_HTTP_PROXY parameter (#575)
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grpcio"
version = "0.11.0"
version = "0.10.3"
edition = "2018"
authors = ["The TiKV Project Developers"]
license = "Apache-2.0"
Expand Down Expand Up @@ -55,4 +55,4 @@ no-omit-frame-pointer = ["grpcio-sys/no-omit-frame-pointer"]
travis-ci = { repository = "tikv/grpc-rs" }

[patch.crates-io]
grpcio-compiler = { path = "compiler", version = "0.11.0", default-features = false }
grpcio-compiler = { path = "compiler", version = "0.10.0", default-features = false }
2 changes: 1 addition & 1 deletion compiler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grpcio-compiler"
version = "0.11.0"
version = "0.10.0"
edition = "2018"
authors = ["The TiKV Project Developers"]
license = "Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions health/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grpcio-health"
version = "0.11.0"
version = "0.10.0"
edition = "2018"
authors = ["The TiKV Project Developers"]
license = "Apache-2.0"
Expand All @@ -20,7 +20,7 @@ prost-codec = ["grpcio/prost-codec", "prost"]
[dependencies]
futures-executor = "0.3"
futures-util = { version = "0.3", default-features = false, features = ["std"] }
grpcio = { path = "..", version = "0.11.0", default-features = false }
grpcio = { path = "..", version = "0.10.0", default-features = false }
prost = { version = "0.10", optional = true }
protobuf = { version = "2", optional = true }
log = "0.4"
4 changes: 2 additions & 2 deletions proto/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grpcio-proto"
version = "0.11.0"
version = "0.10.0"
edition = "2018"
authors = ["The TiKV Project Developers"]
license = "Apache-2.0"
Expand All @@ -18,7 +18,7 @@ protobuf-codec = ["grpcio/protobuf-codec", "protobuf-build/grpcio-protobuf-codec
prost-codec = ["prost-derive", "prost-types", "bytes", "lazy_static", "grpcio/prost-codec", "prost", "protobuf-build/grpcio-prost-codec"]

[dependencies]
grpcio = { path = "..", features = ["boringssl"], version = "0.11.0", default-features = false }
grpcio = { path = "..", features = ["boringssl"], version = "0.10.0", default-features = false }
bytes = { version = "1.0", optional = true }
prost = { version = "0.10", optional = true }
prost-derive = { version = "0.10", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions src/call/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ where
let code = f(batch_ptr, tag_ptr);
if code != grpc_call_error::GRPC_CALL_OK {
unsafe {
drop(Box::from_raw(tag_ptr));
Box::from_raw(tag_ptr);
}
panic!("create call fail: {:?}", code);
}
Expand Down Expand Up @@ -509,7 +509,7 @@ impl Call {
};
if code != grpc_call_error::GRPC_CALL_OK {
unsafe {
drop(Box::from_raw(tag_ptr));
Box::from_raw(tag_ptr);
}
panic!("create call fail: {:?}", code);
}
Expand Down
2 changes: 1 addition & 1 deletion src/call/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ impl RequestContext {
let call = grpc_sys::grpcwrap_request_call_context_get_call(request_ctx);
let code = grpc_sys::grpcwrap_call_recv_message(call, batch_ctx, tag_ptr as _);
if code != grpc_call_error::GRPC_CALL_OK {
drop(Box::from_raw(tag_ptr));
Box::from_raw(tag_ptr);
// it should not failed.
panic!("try to receive message fail: {:?}", code);
}
Expand Down
1 change: 0 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ framework that puts mobile and HTTP/2 first. grpcio is built on [gRPC Core] and
#![allow(clippy::new_without_default)]
#![allow(clippy::cast_lossless)]
#![allow(clippy::option_map_unit_fn)]
#![allow(clippy::derive_partial_eq_without_eq)]

use grpcio_sys as grpc_sys;
#[macro_use]
Expand Down

0 comments on commit f2a52ae

Please sign in to comment.