Skip to content

Commit

Permalink
Remove tokio version bounds
Browse files Browse the repository at this point in the history
This is fine since tokio-rs/tokio#6610 is
resolved via becheran/ntest#28 which has now
been released in ntest 0.9.3
Also bumps the itertools + base64 versions, since they are trivial upgrades
  • Loading branch information
rukai committed Jun 24, 2024
1 parent c8db77b commit 38f644b
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 27 deletions.
30 changes: 15 additions & 15 deletions Cargo.lock.msrv

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ scylla = { path = "../scylla", features = [
"num-bigint-04",
"bigdecimal-04",
] }
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
tokio = { version = ">=1.34, <1.38", features = ["full"] }
tokio = { version = "1.38", features = ["full"] }
tracing = { version = "0.1.25", features = ["log"] }
tracing-subscriber = { version = "0.3.14", features = ["env-filter"] }
chrono = { version = "0.4", default-features = false }
Expand Down
3 changes: 1 addition & 2 deletions scylla-cql/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ license = "MIT OR Apache-2.0"
scylla-macros = { version = "0.5.0", path = "../scylla-macros" }
byteorder = "1.3.4"
bytes = "1.0.1"
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
tokio = { version = ">=1.34, <1.38", features = ["io-util", "time"] }
tokio = { version = "1.38", features = ["io-util", "time"] }
secrecy-08 = { package = "secrecy", version = "0.8", optional = true }
snap = "1.0"
uuid = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions scylla-proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ byteorder = "1.3.4"
bytes = "1.2.0"
futures = "0.3.6"
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
tokio = { version = ">=1.34, <1.38", features = [
tokio = { version = "1.38", features = [
"net",
"time",
"io-util",
Expand All @@ -40,7 +40,7 @@ assert_matches = "1.5.0"
ntest = "0.9.0"
tracing-subscriber = { version = "0.3.14", features = ["env-filter"] }
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
tokio = { version = ">=1.34, <1.38", features = ["signal"] }
tokio = { version = "1.38", features = ["signal"] }

[lints.rust]
unreachable_pub = "warn"
10 changes: 4 additions & 6 deletions scylla/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ bytes = "1.0.1"
futures = "0.3.6"
hashbrown = "0.14"
histogram = "0.6.9"
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
tokio = { version = ">=1.34, <1.38", features = [
tokio = { version = "1.38", features = [
"net",
"time",
"io-util",
Expand All @@ -60,7 +59,7 @@ snap = "1.0"
uuid = { version = "1.0", features = ["v4"] }
rand = "0.8.3"
thiserror = "1.0"
itertools = "0.11.0"
itertools = "0.13.0"
tracing = "0.1.36"
chrono = { version = "0.4.32", default-features = false, features = ["clock"] }
openssl = { version = "0.10.32", optional = true }
Expand All @@ -73,7 +72,7 @@ async-trait = "0.1.56"
serde = { version = "1.0", features = ["derive"], optional = true }
serde_yaml = { version = "0.9.14", optional = true }
url = { version = "2.3.1", optional = true }
base64 = { version = "0.21.1", optional = true }
base64 = { version = "0.22.1", optional = true }
rand_pcg = "0.3.1"
socket2 = { version = "0.5.3", features = ["all"] }
lazy_static = "1"
Expand All @@ -85,8 +84,7 @@ bigdecimal-04 = { package = "bigdecimal", version = "0.4" }
scylla-proxy = { version = "0.0.3", path = "../scylla-proxy" }
ntest = "0.9.0"
criterion = "0.4" # Note: v0.5 needs at least rust 1.70.0
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
tokio = { version = ">=1.34, <1.38", features = ["test-util"] }
tokio = { version = "1.38", features = ["test-util"] }
tracing-subscriber = { version = "0.3.14", features = ["env-filter"] }
assert_matches = "1.5.0"
rand_chacha = "0.3.1"
Expand Down

0 comments on commit 38f644b

Please sign in to comment.