diff --git a/Cargo.toml b/Cargo.toml index d932c9603..fc37ba081 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,3 +14,8 @@ members = [ [patch.crates-io] actix-cors = { path = "actix-cors" } actix-session = { path = "actix-session" } + +# uncomment to quickly test against local actix-web repo +# actix-http = { path = "../actix-web/actix-http" } +# actix-web = { path = "../actix-web" } +# awc = { path = "../actix-web/awc" } diff --git a/actix-identity/CHANGES.md b/actix-identity/CHANGES.md index f6880fabc..d8fcaef4b 100644 --- a/actix-identity/CHANGES.md +++ b/actix-identity/CHANGES.md @@ -1,8 +1,11 @@ # Changes ## Unreleased - 2021-xx-xx +- Update `actix-web` dependency to `4.0.0.beta-18`. [#218] - Minimum supported Rust version (MSRV) is now 1.54. +[#218]: https://github.com/actix/actix-extras/pull/218 + ## 0.4.0-beta.6 - 2021-12-18 - Update `actix-web` dependency to `4.0.0.beta-15`. [#216] diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml index 174cd980b..b744b2257 100644 --- a/actix-identity/Cargo.toml +++ b/actix-identity/Cargo.toml @@ -16,12 +16,12 @@ path = "src/lib.rs" [dependencies] actix-service = "2" actix-utils = "3" -actix-web = { version = "4.0.0-beta.17", default-features = false, features = ["cookies", "secure-cookies"] } +actix-web = { version = "4.0.0-beta.18", default-features = false, features = ["cookies", "secure-cookies"] } futures-util = { version = "0.3.7", default-features = false } serde = "1.0" serde_json = "1.0" -time = "0.2.23" +time = "0.3" [dev-dependencies] actix-http = "3.0.0-beta.15" diff --git a/actix-redis/CHANGES.md b/actix-redis/CHANGES.md index b2ae67471..9d81160b1 100644 --- a/actix-redis/CHANGES.md +++ b/actix-redis/CHANGES.md @@ -1,8 +1,11 @@ # Changes ## Unreleased - 2021-xx-xx +- Update `actix-web` dependency to `4.0.0.beta-18`. [#218] - Minimum supported Rust version (MSRV) is now 1.54. +[#218]: https://github.com/actix/actix-extras/pull/218 + ## 0.10.0-beta.4 - 2021-12-12 - A session will be created in Redis if and only if there is some data inside the session state. This reduces the performance impact of `RedisSession` on routes that do not leverage sessions. [#207] diff --git a/actix-redis/Cargo.toml b/actix-redis/Cargo.toml index 915c5034b..80ba56d37 100644 --- a/actix-redis/Cargo.toml +++ b/actix-redis/Cargo.toml @@ -40,12 +40,12 @@ derive_more = "0.99.2" futures-core = { version = "0.3.7", default-features = false } redis2 = { package = "redis", version = "0.19.0", features = ["tokio-comp", "tokio-native-tls-comp"] } redis-async = { version = "0.8", default-features = false, features = ["tokio10"] } -time = "0.2.23" +time = "0.3" tokio = { version = "1", features = ["sync"] } tokio-util = "0.6.1" # actix-session -actix-web = { version = "4.0.0-beta.17", default_features = false, optional = true } +actix-web = { version = "4.0.0-beta.18", default_features = false, optional = true } actix-session = { version = "0.5.0-beta.6", optional = true } rand = { version = "0.8.0", optional = true } serde = { version = "1.0.101", optional = true } diff --git a/actix-redis/src/session.rs b/actix-redis/src/session.rs index 282993cf2..3f409e4be 100644 --- a/actix-redis/src/session.rs +++ b/actix-redis/src/session.rs @@ -363,7 +363,7 @@ impl Inner { fn remove_cookie(&self, res: &mut ServiceResponse) -> Result<(), Error> { let mut cookie = Cookie::named(self.name.clone()); cookie.set_value(""); - cookie.set_max_age(Duration::zero()); + cookie.set_max_age(Duration::ZERO); cookie.set_expires(OffsetDateTime::now_utc() - Duration::days(365)); let val = diff --git a/actix-session/CHANGES.md b/actix-session/CHANGES.md index 01fbb6030..c5f3f6832 100644 --- a/actix-session/CHANGES.md +++ b/actix-session/CHANGES.md @@ -1,8 +1,11 @@ # Changes ## Unreleased - 2021-xx-xx +- Update `actix-web` dependency to `4.0.0.beta-18`. [#218] - Minimum supported Rust version (MSRV) is now 1.54. +[#218]: https://github.com/actix/actix-extras/pull/218 + ## 0.5.0-beta.6 - 2021-12-18 - Update `actix-web` dependency to `4.0.0.beta-15`. [#216] diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index bdc8240d3..85285a469 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -20,14 +20,14 @@ cookie-session = ["actix-web/secure-cookies"] [dependencies] actix-service = "2" actix-utils = "3" -actix-web = { version = "4.0.0-beta.17", default_features = false, features = ["cookies"] } +actix-web = { version = "4.0.0-beta.18", default_features = false, features = ["cookies"] } derive_more = "0.99.5" futures-util = { version = "0.3.7", default-features = false } log = "0.4" serde = "1.0" serde_json = "1.0" -time = "0.2.23" +time = "0.3" [dev-dependencies] actix-rt = "2" diff --git a/actix-session/src/cookie.rs b/actix-session/src/cookie.rs index e1dc2f348..493a9b180 100644 --- a/actix-session/src/cookie.rs +++ b/actix-session/src/cookie.rs @@ -127,7 +127,7 @@ impl CookieSessionInner { let mut cookie = Cookie::named(self.name.clone()); cookie.set_path(self.path.clone()); cookie.set_value(""); - cookie.set_max_age(Duration::zero()); + cookie.set_max_age(Duration::ZERO); cookie.set_expires(OffsetDateTime::now_utc() - Duration::days(365)); let val = HeaderValue::from_str(&cookie.to_string())?;