diff --git a/redis/Cargo.toml b/redis/Cargo.toml index e9eccc2..7a75462 100644 --- a/redis/Cargo.toml +++ b/redis/Cargo.toml @@ -29,7 +29,7 @@ cluster = ["redis/cluster-async"] deadpool = { path = "../", version = "0.10.0", default-features = false, features = [ "managed", ] } -redis = { version = "0.23", default-features = false, features = ["aio"] } +redis = { version = "0.24", default-features = false, features = ["aio"] } serde_1 = { package = "serde", version = "1.0", features = [ "derive", ], optional = true } @@ -38,7 +38,7 @@ serde_1 = { package = "serde", version = "1.0", features = [ config = { version = "0.13", features = ["json"] } dotenv = "0.15.0" futures = "0.3.15" -redis = { version = "0.23", default-features = false, features = [ +redis = { version = "0.24", default-features = false, features = [ "tokio-comp", ] } tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] } diff --git a/redis/src/config.rs b/redis/src/config.rs index 3a25d29..01daf8a 100644 --- a/redis/src/config.rs +++ b/redis/src/config.rs @@ -124,7 +124,8 @@ impl Default for Config { } } -/// This is a 1:1 copy of the [`redis::ConnectionAddr`] enumeration. +/// This is a 1:1 copy of the [`redis::ConnectionAddr`] enumeration (excluding `tls_params` since it is entirely opaque to consumers). +/// /// This is duplicated here in order to add support for the /// [`serde::Deserialize`] trait which is required for the [`serde`] support. #[derive(Clone, Debug)] @@ -175,6 +176,7 @@ impl From for redis::ConnectionAddr { host, port, insecure, + tls_params: None, }, ConnectionAddr::Unix(path) => Self::Unix(path), } @@ -189,6 +191,7 @@ impl From for ConnectionAddr { host, port, insecure, + .. } => ConnectionAddr::TcpTls { host, port,