Upgrade bb8

svix · Dec 14, 2024 · 0616681 · 0616681
1 parent a450b0f
commit 0616681
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/omniqueue/Cargo.toml b/omniqueue/Cargo.toml
@@ -10,13 +10,12 @@ rust-version = "1.79"
 edition = "2021"
 
 [dependencies]
-async-trait = { version = "0.1", optional = true }
 aws-config = { version = "1.1.5", features = ["behavior-version-latest"], optional = true }
 aws-sdk-sqs = { version = "1.13.0", optional = true }
 azure_storage = { version = "0.21.0", optional = true }
 azure_storage_queues = { version = "0.21.0", optional = true }
-bb8 = { version = "0.8", optional = true }
-bb8-redis = { version = "0.17.0", optional = true }
+bb8 = { version = "0.9.0", optional = true }
+bb8-redis = { version = "0.18.0", optional = true }
 bytesize = "1.3.0"
 futures-util = { version = "0.3.28", default-features = false, features = ["async-await", "std"], optional = true }
 google-cloud-googleapis = { version = "0.16.0", optional = true }
@@ -49,8 +48,8 @@ rabbitmq = ["dep:futures-util", "dep:lapin"]
 # Generate message IDs for queue items. Likely not needed outside of Svix.
 rabbitmq-with-message-ids = ["rabbitmq", "dep:svix-ksuid"]
 redis = ["dep:bb8", "dep:bb8-redis", "dep:redis", "dep:svix-ksuid"]
-redis_cluster = ["dep:async-trait", "redis", "redis/cluster-async"]
-redis_sentinel = ["dep:async-trait", "redis", "redis/sentinel"]
+redis_cluster = ["redis", "redis/cluster-async"]
+redis_sentinel = ["redis", "redis/sentinel"]
 sqs = ["dep:aws-config", "dep:aws-sdk-sqs"]
 azure_queue_storage = ["dep:azure_storage", "dep:azure_storage_queues"]
 beta = []
diff --git a/omniqueue/src/backends/redis/cluster.rs b/omniqueue/src/backends/redis/cluster.rs
@@ -1,4 +1,3 @@
-use async_trait::async_trait;
 use redis::{
     cluster::{ClusterClient, ClusterClientBuilder},
     cluster_routing::{MultipleNodeRoutingInfo, ResponsePolicy, RoutingInfo},
@@ -22,7 +21,6 @@ impl RedisClusterConnectionManager {
     }
 }
 
-#[async_trait]
 impl bb8::ManageConnection for RedisClusterConnectionManager {
     type Connection = redis::cluster_async::ClusterConnection;
     type Error = RedisError;

diff --git a/omniqueue/src/backends/redis/sentinel.rs b/omniqueue/src/backends/redis/sentinel.rs
@@ -1,4 +1,3 @@
-use async_trait::async_trait;
 use redis::{
     sentinel::{SentinelClient, SentinelNodeConnectionInfo, SentinelServerType},
     ErrorKind, IntoConnectionInfo, RedisError,
@@ -33,7 +32,6 @@ impl RedisSentinelConnectionManager {
     }
 }
 
-#[async_trait]
 impl bb8::ManageConnection for RedisSentinelConnectionManager {
     type Connection = redis::aio::MultiplexedConnection;
     type Error = RedisError;