From 0a5c1bf81f1adccab281c0f5b318031c1a79a6d6 Mon Sep 17 00:00:00 2001
From: Lucas Kent <rubickent@gmail.com>
Date: Mon, 24 Jun 2024 15:13:38 +1000
Subject: [PATCH] Remove tokio version bounds

This is fine since https://github.com/tokio-rs/tokio/issues/6610 is
resolved via https://github.com/becheran/ntest/pull/28 which has now
been released in ntest 0.9.3
Also bumps the itertools + base64 versions, since they are trivial upgrades
---
 Cargo.lock.msrv         | 12 ++++++------
 examples/Cargo.toml     |  3 +--
 scylla-cql/Cargo.toml   |  3 +--
 scylla-proxy/Cargo.toml |  6 ++----
 scylla/Cargo.toml       |  6 ++----
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock.msrv b/Cargo.lock.msrv
index 3168c5fcb7..9873a9f603 100644
--- a/Cargo.lock.msrv
+++ b/Cargo.lock.msrv
@@ -961,9 +961,9 @@ dependencies = [
 
 [[package]]
 name = "ntest"
-version = "0.9.0"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da8ec6d2b73d45307e926f5af46809768581044384637af6b3f3fe7c3c88f512"
+checksum = "fb183f0a1da7a937f672e5ee7b7edb727bf52b8a52d531374ba8ebb9345c0330"
 dependencies = [
  "ntest_test_cases",
  "ntest_timeout",
@@ -971,9 +971,9 @@ dependencies = [
 
 [[package]]
 name = "ntest_test_cases"
-version = "0.9.0"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be7d33be719c6f4d09e64e27c1ef4e73485dc4cc1f4d22201f89860a7fe22e22"
+checksum = "16d0d3f2a488592e5368ebbe996e7f1d44aa13156efad201f5b4d84e150eaa93"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -982,9 +982,9 @@ dependencies = [
 
 [[package]]
 name = "ntest_timeout"
-version = "0.9.0"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "066b468120587a402f0b47d8f80035c921f6a46f8209efd0632a89a16f5188a4"
+checksum = "fcc7c92f190c97f79b4a332f5e81dcf68c8420af2045c936c9be0bc9de6f63b5"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index bd44695aae..5b335fd34f 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -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.34", 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 }
diff --git a/scylla-cql/Cargo.toml b/scylla-cql/Cargo.toml
index 2dae50d09f..bf827a4ed1 100644
--- a/scylla-cql/Cargo.toml
+++ b/scylla-cql/Cargo.toml
@@ -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.34", features = ["io-util", "time"] }
 secrecy-08 = { package = "secrecy", version = "0.8", optional = true }
 snap = "1.0"
 uuid = "1.0"
diff --git a/scylla-proxy/Cargo.toml b/scylla-proxy/Cargo.toml
index 5e2d547753..665d829b07 100644
--- a/scylla-proxy/Cargo.toml
+++ b/scylla-proxy/Cargo.toml
@@ -17,8 +17,7 @@ scylla-cql = { version = "0.2.0", path = "../scylla-cql" }
 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.34", features = [
     "net",
     "time",
     "io-util",
@@ -39,8 +38,7 @@ rand = "0.8.5"
 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.34", features = ["signal"] }
 
 [lints.rust]
 unreachable_pub = "warn"
diff --git a/scylla/Cargo.toml b/scylla/Cargo.toml
index 3096ff7d6d..9067ae684f 100644
--- a/scylla/Cargo.toml
+++ b/scylla/Cargo.toml
@@ -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.34", features = [
     "net",
     "time",
     "io-util",
@@ -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.34", features = ["test-util"] }
 tracing-subscriber = { version = "0.3.14", features = ["env-filter"] }
 assert_matches = "1.5.0"
 rand_chacha = "0.3.1"