Skip to content

Commit d932a20

Browse files
authored
Merge pull request #40 from nrc/qol
Some very minor improvements
2 parents 3ab4f95 + ae57fbb commit d932a20

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ integration-tests = []
1818
name = "tikv_client"
1919

2020
[dependencies]
21+
failure = "0.1"
2122
futures = "0.1"
22-
serde = "1.0"
23-
serde_derive = "1.0"
23+
fxhash = "0.2"
2424
grpcio = { version = "0.4", features = [ "secure" ] }
25+
lazy_static = "0.2.1"
26+
log = "0.3.9"
2527
protobuf = "~2.0"
28+
serde = "1.0"
29+
serde_derive = "1.0"
2630
tokio-core = "0.1"
2731
tokio-timer = "0.2"
28-
fxhash = "0.2"
29-
lazy_static = "0.2.1"
30-
log = "0.3.9"
31-
failure = "0.1"
3232

3333
[dependencies.kvproto]
3434
git = "https://github.com/pingcap/kvproto.git"
@@ -40,5 +40,5 @@ default-features = false
4040
features = ["push", "process"]
4141

4242
[dev-dependencies]
43-
tempdir = "0.3"
4443
clap = "2.32"
44+
tempdir = "0.3"

rust-toolchain

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
// Long and nested future chains can quickly result in large generic types.
1515
#![type_length_limit = "16777216"]
16+
#![allow(clippy::redundant_closure)]
1617

1718
//! TiKV Client for Rust.
1819
//!

src/rpc/security.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ impl SecurityManager {
7777
{
7878
info!("connect to rpc server at endpoint: {:?}", addr);
7979
let addr = addr
80-
.trim_left_matches("http://")
81-
.trim_left_matches("https://");
80+
.trim_start_matches("http://")
81+
.trim_start_matches("https://");
8282
let cb = ChannelBuilder::new(env)
8383
.keepalive_time(Duration::from_secs(10))
8484
.keepalive_timeout(Duration::from_secs(3));

0 commit comments

Comments
 (0)