diff --git a/Cargo.lock b/Cargo.lock index f21ad472..a07339e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -96,6 +96,12 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" +[[package]] +name = "arcstr" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03918c3dbd7701a85c6b9887732e2921175f26c350b4563841d0958c21d57e6d" + [[package]] name = "async-trait" version = "0.1.88" @@ -1258,7 +1264,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1543,31 +1549,12 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - [[package]] name = "num-conv" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.19" @@ -1789,10 +1776,11 @@ dependencies = [ [[package]] name = "redis" -version = "0.32.4" +version = "1.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1f66bf4cac9733a23bcdf1e0e01effbaaad208567beba68be8f67e5f4af3ee1" +checksum = "92eee65955fc9d44e8efda17dd3794b7cf1e9dd96f39b805ae551111f4b77ce2" dependencies = [ + "arcstr", "bytes", "cfg-if", "combine", @@ -1801,7 +1789,6 @@ dependencies = [ "futures-util", "itoa", "log", - "num-bigint", "percent-encoding", "pin-project-lite", "rand 0.9.1", @@ -2951,7 +2938,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/crates/socketioxide-redis/Cargo.toml b/crates/socketioxide-redis/Cargo.toml index 96e41a8c..0d217b31 100644 --- a/crates/socketioxide-redis/Cargo.toml +++ b/crates/socketioxide-redis/Cargo.toml @@ -39,7 +39,7 @@ fred = { version = "10", features = [ "subscriber-client", "i-pubsub", ], default-features = false, optional = true } -redis = { version = "0.32", features = [ +redis = { version = "1.0.0-rc.2", features = [ "aio", "tokio-comp", "streams", diff --git a/crates/socketioxide-redis/src/drivers/redis.rs b/crates/socketioxide-redis/src/drivers/redis.rs index 6913bdac..87c045ce 100644 --- a/crates/socketioxide-redis/src/drivers/redis.rs +++ b/crates/socketioxide-redis/src/drivers/redis.rs @@ -51,8 +51,8 @@ fn read_msg(msg: redis::PushInfo) -> RedisResult)>> { return Ok(None); } let mut iter = msg.data.into_iter(); - let channel: String = FromRedisValue::from_owned_redis_value(iter.next().unwrap())?; - let message = FromRedisValue::from_owned_redis_value(iter.next().unwrap())?; + let channel: String = FromRedisValue::from_redis_value(iter.next().unwrap())?; + let message = FromRedisValue::from_redis_value(iter.next().unwrap())?; Ok(Some((channel, message))) } _ => Ok(None), diff --git a/examples/chat/src/redis/redis.rs b/examples/chat/src/redis/redis.rs index d879ebb9..810f218a 100644 --- a/examples/chat/src/redis/redis.rs +++ b/examples/chat/src/redis/redis.rs @@ -68,7 +68,7 @@ async fn main() -> Result<(), Box> { let client = redis::Client::open("redis://127.0.0.1:6379?protocol=resp3")?; let adapter = RedisAdapterCtr::new_with_redis(&client).await?; - let conn = client.get_multiplexed_tokio_connection().await?; + let conn = client.get_multiplexed_async_connection().await?; let (layer, io) = SocketIo::builder() .with_state(RemoteUserCnt::new(conn))