Skip to content

Commit 1238c13

Browse files
committed
cargo: put restrictions on tokio version
We decided to bump minimum required version of tokio to 1.34. Currently, the newest tokio version is 1.38, but some of the integration tests are eaten when testing with this specific verstion of tokio. Which is why, as of now, we decided not to support this version. The issue with version 1.38 is related to #[tokio::test] and #[ntest::timeout] attributes. Refs: - tokio-rs/tokio#6610 - becheran/ntest#28 - tokio-rs/tokio#6497
1 parent 82c4492 commit 1238c13

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

examples/Cargo.toml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,22 @@ futures = "0.3.6"
1010
openssl = "0.10.32"
1111
rustyline = "9"
1212
rustyline-derive = "0.6"
13-
scylla = {path = "../scylla", features = ["ssl", "cloud", "chrono", "time", "num-bigint-03", "num-bigint-04", "bigdecimal-04"]}
14-
tokio = {version = "1.1.0", features = ["full"]}
15-
tracing = { version = "0.1.25" , features = ["log"] }
13+
scylla = { path = "../scylla", features = [
14+
"ssl",
15+
"cloud",
16+
"chrono",
17+
"time",
18+
"num-bigint-03",
19+
"num-bigint-04",
20+
"bigdecimal-04",
21+
] }
22+
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
23+
tokio = { version = ">=1.34, <1.38", features = ["full"] }
24+
tracing = { version = "0.1.25", features = ["log"] }
1625
tracing-subscriber = { version = "0.3.14", features = ["env-filter"] }
1726
chrono = { version = "0.4", default-features = false }
1827
time = { version = "0.3.22" }
19-
uuid = { version = "1.0", features = ["v1"]}
28+
uuid = { version = "1.0", features = ["v1"] }
2029
tower = "0.4"
2130
stats_alloc = "0.1"
2231
clap = { version = "3.2.4", features = ["derive"] }

scylla-cql/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ license = "MIT OR Apache-2.0"
1313
scylla-macros = { version = "0.5.0", path = "../scylla-macros" }
1414
byteorder = "1.3.4"
1515
bytes = "1.0.1"
16-
tokio = { version = "1.12", features = ["io-util", "time"] }
16+
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
17+
tokio = { version = ">=1.34, <1.38", features = ["io-util", "time"] }
1718
secrecy = { version = "0.7.0", optional = true }
1819
snap = "1.0"
1920
uuid = "1.0"

scylla-proxy/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ scylla-cql = { version = "0.2.0", path = "../scylla-cql" }
1717
byteorder = "1.3.4"
1818
bytes = "1.2.0"
1919
futures = "0.3.6"
20-
tokio = { version = "1.12", features = [
20+
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
21+
tokio = { version = ">=1.34, <1.38", features = [
2122
"net",
2223
"time",
2324
"io-util",
@@ -38,7 +39,8 @@ rand = "0.8.5"
3839
assert_matches = "1.5.0"
3940
ntest = "0.9.0"
4041
tracing-subscriber = { version = "0.3.14", features = ["env-filter"] }
41-
tokio = { version = "1.12", features = ["signal"] }
42+
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
43+
tokio = { version = ">=1.34, <1.38", features = ["signal"] }
4244

4345
[lints.rust]
4446
unreachable_pub = "warn"

scylla/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ bytes = "1.0.1"
4747
futures = "0.3.6"
4848
hashbrown = "0.14"
4949
histogram = "0.6.9"
50-
tokio = { version = "1.34", features = [
50+
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
51+
tokio = { version = ">=1.34, <1.38", features = [
5152
"net",
5253
"time",
5354
"io-util",
@@ -83,8 +84,9 @@ num-bigint-04 = { package = "num-bigint", version = "0.4" }
8384
bigdecimal-04 = { package = "bigdecimal", version = "0.4" }
8485
scylla-proxy = { version = "0.0.3", path = "../scylla-proxy" }
8586
ntest = "0.9.0"
86-
criterion = "0.4" # Note: v0.5 needs at least rust 1.70.0
87-
tokio = { version = "1.27", features = ["test-util"] }
87+
criterion = "0.4" # Note: v0.5 needs at least rust 1.70.0
88+
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
89+
tokio = { version = ">=1.34, <1.38", features = ["test-util"] }
8890
tracing-subscriber = { version = "0.3.14", features = ["env-filter"] }
8991
assert_matches = "1.5.0"
9092
rand_chacha = "0.3.1"

0 commit comments

Comments
 (0)