build(deps): update redis requirement from 0.24 to 0.25 (#412)

* build(deps): update redis requirement from 0.24 to 0.25

Updates the requirements on [redis](https://github.com/redis-rs/redis-rs) to permit the latest version.
- [Release notes](https://github.com/redis-rs/redis-rs/releases)
- [Commits](https://github.com/redis-rs/redis-rs/compare/redis-0.24.0...redis-0.25.0)

---
updated-dependencies:
- dependency-name: redis
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* refactor(session): rename TLS features

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rob Ede <robjtede@icloud.com>

actix-session/CHANGES.md

@@ -2,7 +2,9 @@
 
 ## Unreleased
 
-- Added support for using `rustls` in `actix-session` instead of `native-tls`
+- Add `redis-session-rustls` crate feature that enables `rustls`-secured Redis sessions.
+- Rename `redis-rs-session` crate feature to `redis-session`.
+- Rename `redis-rs-tls-session` crate feature to `redis-session-native-tls`.
 - Remove `redis-actor-session` crate feature (and, therefore, the `actix-redis` based storage backend).
 
 ## 0.9.0

actix-session/Cargo.toml

@@ -20,9 +20,9 @@ all-features = true
 [features]
 default = []
 cookie-session = []
-redis-rs-session = ["redis", "rand"]
-redis-rs-tls-session = ["redis-rs-session", "redis/tokio-native-tls-comp"]
-redis-rs-tls-session-rustls = ["redis-rs-session", "redis/tokio-rustls-comp"]
+redis-session = ["dep:redis", "dep:rand"]
+redis-session-native-tls = ["redis-session", "redis/tokio-native-tls-comp"]
+redis-session-rustls = ["redis-session", "redis/tokio-rustls-comp"]
 
 [dependencies]
 actix-service = "2"
@@ -36,11 +36,11 @@ serde = { version = "1" }
 serde_json = { version = "1" }
 tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
-# redis-rs-session
-redis = { version = "0.24", default-features = false, features = ["tokio-comp", "connection-manager"], optional = true }
+# redis-session
+redis = { version = "0.25", default-features = false, features = ["tokio-comp", "connection-manager"], optional = true }
 
 [dev-dependencies]
-actix-session = { path = ".", features = ["cookie-session", "redis-rs-session"] }
+actix-session = { path = ".", features = ["cookie-session", "redis-session"] }
 actix-test = "0.1.0-beta.10"
 actix-web = { version = "4", default-features = false, features = ["cookies", "secure-cookies", "macros"] }
 tracing-subscriber = {version = "0.3", features = ["env-filter"]}
@@ -48,8 +48,8 @@ tracing = "0.1.30"
 
 [[example]]
 name = "basic"
-required-features = ["redis-rs-session"]
+required-features = ["redis-session"]
 
 [[example]]
 name = "authentication"
-required-features = ["redis-rs-session"]
+required-features = ["redis-session"]

actix-session/README.md

@@ -100,28 +100,28 @@ By default, `actix-session` does not provide any storage backend to retrieve and
   actix-session = { version = "...", features = ["cookie-session"] }
   ```
 
-- a Redis-based backend via [`redis-rs`](https://docs.rs/redis-rs), [`RedisSessionStore`], using the `redis-rs-session` feature flag.
+- a Redis-based backend via [`redis-rs`](https://docs.rs/redis-rs), [`RedisSessionStore`], using the `redis-session` feature flag.
 
   ```toml
   [dependencies]
   # ...
-  actix-session = { version = "...", features = ["redis-rs-session"] }
+  actix-session = { version = "...", features = ["redis-session"] }
   ```
 
-  Add the `redis-rs-tls-session` feature flag if you want to connect to Redis using a secured connection (via the `native-tls` crate):
+  Add the `redis-session-native-tls` feature flag if you want to connect to Redis using a secured connection (via the `native-tls` crate):
 
   ```toml
   [dependencies]
   # ...
-  actix-session = { version = "...", features = ["redis-rs-tls-session"] }
+  actix-session = { version = "...", features = ["redis-session-native-tls"] }
   ```
 
-  If you instead prefer depending on `rustls`, use the `redis-rs-tls-session-rustls` feature flag:
+  If you instead prefer depending on `rustls`, use the `redis-session-rustls` feature flag:
 
   ```toml
   [dependencies]
   # ...
-  actix-session = { version = "...", features = ["redis-rs-tls-session-rustls"] }
+  actix-session = { version = "...", features = ["redis-session-rustls"] }
   ```
 
 You can implement your own session storage backend using the [`SessionStore`] trait.

actix-session/src/lib.rs

@@ -107,29 +107,29 @@ attached to your sessions. You can enable:
   ```
 
 - a Redis-based backend via [`redis-rs`](https://docs.rs/redis-rs), [`RedisSessionStore`], using
-  the `redis-rs-session` feature flag.
+  the `redis-session` feature flag.
 
   ```toml
   [dependencies]
   # ...
-  actix-session = { version = "...", features = ["redis-rs-session"] }
+  actix-session = { version = "...", features = ["redis-session"] }
   ```
 
-  Add the `redis-rs-tls-session` feature flag if you want to connect to Redis using a secured
+  Add the `redis-session-native-tls` feature flag if you want to connect to Redis using a secured
   connection (via the `native-tls` crate):
 
   ```toml
   [dependencies]
   # ...
-  actix-session = { version = "...", features = ["redis-rs-tls-session"] }
+  actix-session = { version = "...", features = ["redis-session-native-tls"] }
   ```
 
-  If you instead prefer depending on `rustls`, use the `redis-rs-tls-session-rustls` feature flag:
+  If you instead prefer depending on `rustls`, use the `redis-session-rustls` feature flag:
 
   ```toml
   [dependencies]
   # ...
-  actix-session = { version = "...", features = ["redis-rs-tls-session-rustls"] }
+  actix-session = { version = "...", features = ["redis-session-rustls"] }
   ```
 
 You can implement your own session storage backend using the [`SessionStore`] trait.

actix-session/src/storage/mod.rs

@@ -11,13 +11,13 @@ pub use self::{
 #[cfg(feature = "cookie-session")]
 mod cookie;
 
-#[cfg(feature = "redis-rs-session")]
+#[cfg(feature = "redis-session")]
 mod redis_rs;
 
-#[cfg(feature = "redis-rs-session")]
+#[cfg(feature = "redis-session")]
 mod utils;
 
 #[cfg(feature = "cookie-session")]
 pub use cookie::CookieSessionStore;
-#[cfg(feature = "redis-rs-session")]
+#[cfg(feature = "redis-session")]
 pub use redis_rs::{RedisSessionStore, RedisSessionStoreBuilder};