Skip to content

Commit 6000f66

Browse files
authored
Merge pull request #247 from nrc/cargo
Upgrade a bunch of deps
2 parents 47478cb + a602688 commit 6000f66

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ name = "tikv_client"
2020
[dependencies]
2121
async-trait = "0.1"
2222
derive-new = "0.5"
23-
futures = { version = "0.3.5", features = ["async-await", "thread-pool"] }
23+
futures = { version = "0.3", features = ["async-await", "thread-pool"] }
2424
futures-timer = "3.0"
2525
grpcio = { version = "0.8", features = [ "secure", "prost-codec", "use-bindgen" ], default-features = false }
2626
lazy_static = "1"
2727
log = "0.4"
28-
prometheus = { version = "0.11", features = [ "push", "process" ], default-features = false }
28+
prometheus = { version = "0.12", features = [ "push", "process" ], default-features = false }
2929
rand = "0.8"
3030
regex = "1"
3131
serde = "1.0"
@@ -37,16 +37,16 @@ tikv-client-common = { path = "tikv-client-common" }
3737
tikv-client-pd = { path = "tikv-client-pd" }
3838
tikv-client-proto = { path = "tikv-client-proto" }
3939
tikv-client-store = { path = "tikv-client-store" }
40-
mock-tikv = {path = "mock-tikv"}
4140

4241

4342
[dev-dependencies]
44-
clap = "2.32"
43+
clap = "2"
4544
fail = { version = "0.4", features = [ "failpoints" ] }
46-
proptest = "0.10"
47-
proptest-derive = "0.2"
45+
mock-tikv = {path = "mock-tikv"}
46+
proptest = "1"
47+
proptest-derive = "0.3"
4848
serial_test = "0.5.0"
49-
simple_logger = "1.9.0"
49+
simple_logger = "1"
5050
tokio = { version = "1.0", features = [ "sync", "rt-multi-thread", "macros" ] }
5151

5252
[workspace]

mock-tikv/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ version = "0.0.0"
44
edition = "2018"
55

66
[dependencies]
7-
derive-new = "0.5.8"
8-
futures = "0.3.5"
7+
derive-new = "0.5"
8+
futures = "0.3"
99
grpcio = { version = "0.8", features = [ "secure", "prost-codec", "use-bindgen" ], default-features = false }
1010
log = "0.4"
1111
tikv-client-proto = { path = "../tikv-client-proto"}

tikv-client-common/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ edition = "2018"
66

77
[dependencies]
88
thiserror = "1"
9-
futures = { version = "0.3.5", features = ["compat", "async-await", "thread-pool"] }
9+
futures = { version = "0.3", features = ["compat", "async-await", "thread-pool"] }
1010
grpcio = { version = "0.8", features = [ "secure", "prost-codec", "use-bindgen" ], default-features = false }
1111
lazy_static = "1"
1212
log = "0.4"
1313
regex = "1"
1414
tikv-client-proto = { path = "../tikv-client-proto" }
1515

1616
[dev-dependencies]
17-
clap = "2.32"
17+
clap = "2"
1818
fail = { version = "0.4", features = [ "failpoints" ] }
19-
proptest = "0.10"
20-
proptest-derive = "0.2"
19+
proptest = "1"
20+
proptest-derive = "0.3"
2121
tempfile = "3"
2222
tokio = "1.0"

tikv-client-pd/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ edition = "2018"
55

66
[dependencies]
77
async-trait = "0.1"
8-
futures = { version = "0.3.5", features = ["compat", "async-await", "thread-pool"] }
8+
futures = { version = "0.3", features = ["compat", "async-await", "thread-pool"] }
99
grpcio = { version = "0.8", features = [ "secure", "prost-codec", "use-bindgen" ], default-features = false }
1010
log = "0.4"
1111
tikv-client-common = { path = "../tikv-client-common" }
1212
tikv-client-proto = { path = "../tikv-client-proto" }
1313

1414
[dev-dependencies]
15-
clap = "2.32"
15+
clap = "2"
1616
fail = { version = "0.4", features = [ "failpoints" ] }
17-
proptest = "0.10"
18-
proptest-derive = "0.2"
17+
proptest = "1"
18+
proptest-derive = "0.3"

tikv-client-proto/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ build = "build.rs"
88
protobuf-build = { version = "0.12", default-features = false, features = ["grpcio-prost-codec"] }
99

1010
[dependencies]
11-
protobuf = "=2.8.0"
11+
protobuf = "2.8"
1212
prost = { version = "0.7" }
1313
prost-derive = { version = "0.7" }
14-
futures = "0.3.5"
14+
futures = "0.3"
1515
grpcio = { version = "0.8", default-features = false, features = ["secure", "prost-codec", "use-bindgen"] }
16-
lazy_static = { version = "1.3" }
16+
lazy_static = { version = "1" }

tikv-client-store/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2018"
66
[dependencies]
77
async-trait = "0.1"
88
derive-new = "0.5"
9-
futures = { version = "0.3.5", features = ["compat", "async-await", "thread-pool"] }
9+
futures = { version = "0.3", features = ["compat", "async-await", "thread-pool"] }
1010
grpcio = { version = "0.8", features = ["secure", "prost-codec", "use-bindgen"], default-features = false }
1111
log = "0.4"
1212
tikv-client-common = { path = "../tikv-client-common" }

0 commit comments

Comments
 (0)