Skip to content

Commit 68b7f1e

Browse files
authored
chore: bump grpc-rs to 0.10 (#339)
* chore: bump grpc-rs to 0.10 Signed-off-by: Alex Chi <iskyzh@gmail.com> * set_context no-op Signed-off-by: Alex Chi <iskyzh@gmail.com> * fix integration test Signed-off-by: Alex Chi <iskyzh@gmail.com>
1 parent 74db41c commit 68b7f1e

File tree

8 files changed

+11
-9
lines changed

8 files changed

+11
-9
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ either = "1.6"
2424
fail = "0.4"
2525
futures = { version = "0.3", features = ["async-await", "thread-pool"] }
2626
futures-timer = "3.0"
27-
grpcio = { version = "0.9", features = [ "secure", "prost-codec", "use-bindgen", "openssl-vendored" ], default-features = false }
27+
grpcio = { version = "0.10", features = [ "prost-codec", "openssl-vendored" ], default-features = false }
2828
lazy_static = "1"
2929
log = "0.4"
3030
prometheus = { version = "0.12", features = [ "push", "process" ], default-features = false }

mock-tikv/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ edition = "2018"
66
[dependencies]
77
derive-new = "0.5"
88
futures = "0.3"
9-
grpcio = { version = "0.9", features = [ "secure", "prost-codec", "use-bindgen" ], default-features = false }
9+
grpcio = { version = "0.10", features = [ "prost-codec" ], default-features = false }
1010
log = "0.4"
1111
tikv-client-proto = { path = "../tikv-client-proto"}

src/kv/bound_range.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ impl BoundRange {
151151
}
152152

153153
impl RangeBounds<Key> for BoundRange {
154+
// clippy will act differently on nightly and stable, so we allow `needless_match` here.
155+
#[allow(clippy::needless_match)]
154156
fn start_bound(&self) -> Bound<&Key> {
155157
match &self.from {
156158
Bound::Included(f) => Bound::Included(f),

tikv-client-common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description = "Common components of the TiKV Rust client"
1010
[dependencies]
1111
thiserror = "1"
1212
futures = { version = "0.3", features = ["compat", "async-await", "thread-pool"] }
13-
grpcio = { version = "0.9", features = [ "secure", "prost-codec", "use-bindgen" ], default-features = false }
13+
grpcio = { version = "0.10", features = [ "prost-codec" ], default-features = false }
1414
lazy_static = "1"
1515
log = "0.4"
1616
regex = "1"

tikv-client-pd/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description = "Low level PD components for the TiKV Rust client"
1010
[dependencies]
1111
async-trait = "0.1"
1212
futures = { version = "0.3", features = ["compat", "async-await", "thread-pool"] }
13-
grpcio = { version = "0.9", features = [ "secure", "prost-codec", "use-bindgen" ], default-features = false }
13+
grpcio = { version = "0.10", features = [ "prost-codec" ], default-features = false }
1414
log = "0.4"
1515
tikv-client-common = { version = "0.1.0", path = "../tikv-client-common" }
1616
tikv-client-proto = { version = "0.1.0", path = "../tikv-client-proto" }

tikv-client-proto/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ protobuf-build = { version = "0.12", default-features = false, features = ["grpc
1313

1414
[dependencies]
1515
protobuf = "2.8"
16-
prost = { version = "0.7" }
17-
prost-derive = { version = "0.7" }
16+
prost = { version = "0.9" }
17+
prost-derive = { version = "0.9" }
1818
futures = "0.3"
19-
grpcio = { version = "0.9", default-features = false, features = ["secure", "prost-codec", "use-bindgen"] }
19+
grpcio = { version = "0.10", features = [ "prost-codec" ], default-features = false }
2020
lazy_static = { version = "1" }

tikv-client-store/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ description = "Low level TiKV node components of the TiKV Rust client"
1111
async-trait = "0.1"
1212
derive-new = "0.5"
1313
futures = { version = "0.3", features = ["compat", "async-await", "thread-pool"] }
14-
grpcio = { version = "0.9", features = ["secure", "prost-codec", "use-bindgen"], default-features = false }
14+
grpcio = { version = "0.10", features = [ "prost-codec" ], default-features = false }
1515
log = "0.4"
1616
tikv-client-common = { version = "0.1.0", path = "../tikv-client-common" }
1717
tikv-client-proto = { version = "0.1.0", path = "../tikv-client-proto" }

tikv-client-store/src/request.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ macro_rules! impl_request {
3939
}
4040

4141
fn set_context(&mut self, context: kvrpcpb::Context) {
42-
self.set_context(context);
42+
kvrpcpb::$name::set_context(self, context)
4343
}
4444
}
4545
};

0 commit comments

Comments
 (0)