From 4eb779be77751616f6536e619100c91d0b664af2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 04:02:50 +0100 Subject: [PATCH 1/7] build(deps): bump taiki-e/install-action from 2.42.14 to 2.42.37 (#460) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.42.14 to 2.42.37. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/v2.42.14...v2.42.37) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-post-merge.yml | 4 ++-- .github/workflows/ci.yml | 6 +++--- .github/workflows/coverage.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index 0ce620d4d..ad0be5ffd 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -36,7 +36,7 @@ jobs: toolchain: nightly - name: Install cargo-hack, cargo-ci-cache-clean - uses: taiki-e/install-action@v2.42.14 + uses: taiki-e/install-action@v2.42.37 with: tool: cargo-hack,cargo-ci-cache-clean @@ -86,7 +86,7 @@ jobs: toolchain: nightly - name: Install cargo-hack and cargo-ci-cache-clean - uses: taiki-e/install-action@v2.42.14 + uses: taiki-e/install-action@v2.42.37 with: tool: cargo-hack,cargo-ci-cache-clean diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8106f0812..4e4b5eb56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack and cargo-ci-cache-clean - uses: taiki-e/install-action@v2.42.14 + uses: taiki-e/install-action@v2.42.37 with: tool: cargo-hack,cargo-ci-cache-clean @@ -107,7 +107,7 @@ jobs: toolchain: ${{ matrix.version.version }} - name: Install cargo-hack, cargo-ci-cache-clean - uses: taiki-e/install-action@v2.42.14 + uses: taiki-e/install-action@v2.42.37 with: tool: cargo-hack,cargo-ci-cache-clean @@ -144,7 +144,7 @@ jobs: toolchain: nightly - name: Install just - uses: taiki-e/install-action@v2.42.14 + uses: taiki-e/install-action@v2.42.37 with: tool: just diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index d1b055ec9..46e464d6d 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -31,7 +31,7 @@ jobs: components: llvm-tools-preview - name: Install just, cargo-llvm-cov, cargo-nextest - uses: taiki-e/install-action@v2.42.14 + uses: taiki-e/install-action@v2.42.37 with: tool: just,cargo-llvm-cov,cargo-nextest From dd1421f1a0d243fb3bf0b12b3e05401cb5ef25ec Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 12 Sep 2024 14:50:48 -0400 Subject: [PATCH 2/7] chore(actix-session): prepare release 0.10.1 --- actix-session/CHANGES.md | 4 ++++ actix-session/Cargo.toml | 2 +- actix-session/README.md | 4 ++-- actix-session/src/storage/mod.rs | 6 ++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/actix-session/CHANGES.md b/actix-session/CHANGES.md index 779d49ed2..7cbff0590 100644 --- a/actix-session/CHANGES.md +++ b/actix-session/CHANGES.md @@ -2,6 +2,10 @@ ## Unreleased +## 0.10.1 + +- Expose `storage::generate_session_key()` without needing to enable a crate feature. + ## 0.10.0 - Add `redis-session-rustls` crate feature that enables `rustls`-secured Redis sessions. diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index c50926b84..b680df12f 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-session" -version = "0.10.0" +version = "0.10.1" authors = [ "Nikolay Kim ", "Luca Palmieri ", diff --git a/actix-session/README.md b/actix-session/README.md index 8bbdd3af7..f14c1a875 100644 --- a/actix-session/README.md +++ b/actix-session/README.md @@ -5,9 +5,9 @@ [![crates.io](https://img.shields.io/crates/v/actix-session?label=latest)](https://crates.io/crates/actix-session) -[![Documentation](https://docs.rs/actix-session/badge.svg?version=0.10.0)](https://docs.rs/actix-session/0.10.0) +[![Documentation](https://docs.rs/actix-session/badge.svg?version=0.10.1)](https://docs.rs/actix-session/0.10.1) ![Apache 2.0 or MIT licensed](https://img.shields.io/crates/l/actix-session) -[![Dependency Status](https://deps.rs/crate/actix-session/0.10.0/status.svg)](https://deps.rs/crate/actix-session/0.10.0) +[![Dependency Status](https://deps.rs/crate/actix-session/0.10.1/status.svg)](https://deps.rs/crate/actix-session/0.10.1) diff --git a/actix-session/src/storage/mod.rs b/actix-session/src/storage/mod.rs index 39395f0cb..812fb8d66 100644 --- a/actix-session/src/storage/mod.rs +++ b/actix-session/src/storage/mod.rs @@ -11,12 +11,10 @@ mod utils; #[cfg(feature = "cookie-session")] pub use self::cookie::CookieSessionStore; +#[cfg(feature = "redis-session")] +pub use self::redis_rs::{RedisSessionStore, RedisSessionStoreBuilder}; pub use self::{ interface::{LoadError, SaveError, SessionStore, UpdateError}, session_key::SessionKey, -}; -#[cfg(feature = "redis-session")] -pub use self::{ - redis_rs::{RedisSessionStore, RedisSessionStoreBuilder}, utils::generate_session_key, }; From 26ccf8b2007051a061e3ba37bcd409fa07a8c651 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 12 Sep 2024 14:55:04 -0400 Subject: [PATCH 3/7] chore: fix feature gate --- actix-session/src/storage/mod.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/actix-session/src/storage/mod.rs b/actix-session/src/storage/mod.rs index 812fb8d66..df77b37ce 100644 --- a/actix-session/src/storage/mod.rs +++ b/actix-session/src/storage/mod.rs @@ -6,7 +6,6 @@ mod interface; #[cfg(feature = "redis-session")] mod redis_rs; mod session_key; -#[cfg(feature = "redis-session")] mod utils; #[cfg(feature = "cookie-session")] From 3c640ec120bc04fa71f8053f05cb272736e5a427 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 12 Sep 2024 14:56:33 -0400 Subject: [PATCH 4/7] chore: fix rand optionality --- actix-session/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index b680df12f..bfb0bb1c8 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -20,7 +20,7 @@ all-features = true [features] default = [] cookie-session = [] -redis-session = ["dep:redis", "dep:rand"] +redis-session = ["dep:redis"] redis-session-native-tls = ["redis-session", "redis/tokio-native-tls-comp"] redis-session-rustls = ["redis-session", "redis/tokio-rustls-comp"] redis-pool = ["dep:deadpool-redis"] @@ -32,7 +32,7 @@ actix-web = { version = "4", default-features = false, features = ["cookies", "s anyhow = "1" derive_more = { version = "1", features = ["display", "error", "from"] } -rand = { version = "0.8", optional = true } +rand = "0.8" serde = { version = "1" } serde_json = { version = "1" } tracing = { version = "0.1.30", default-features = false, features = ["log"] } From a89d3a58bc5c4a6e826bda86ac3f71d632ce64d5 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 12 Sep 2024 15:06:22 -0400 Subject: [PATCH 5/7] refactor: fix nightly warning --- actix-web-httpauth/src/utils.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actix-web-httpauth/src/utils.rs b/actix-web-httpauth/src/utils.rs index 05d61cdaa..6867f471d 100644 --- a/actix-web-httpauth/src/utils.rs +++ b/actix-web-httpauth/src/utils.rs @@ -12,8 +12,8 @@ struct Quoted<'a> { state: State, } -impl<'a> Quoted<'a> { - pub fn new(s: &'a str) -> Quoted<'_> { +impl Quoted<'_> { + pub fn new(s: &str) -> Quoted<'_> { Quoted { inner: s.split('"').peekable(), state: State::YieldStr, From a3211b73d365fbda14c1069ea4b56bbdb540ebf7 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 12 Sep 2024 15:07:36 -0400 Subject: [PATCH 6/7] chore(actix-identity): prepare release 0.8.0 --- actix-identity/CHANGES.md | 2 ++ actix-identity/Cargo.toml | 2 +- actix-identity/README.md | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/actix-identity/CHANGES.md b/actix-identity/CHANGES.md index 04de589f2..a5c556048 100644 --- a/actix-identity/CHANGES.md +++ b/actix-identity/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +## 0.8.0 + - Update `actix-session` dependency to `0.10`. ## 0.7.1 diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml index ab7ae6314..d1ac3959c 100644 --- a/actix-identity/Cargo.toml +++ b/actix-identity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-identity" -version = "0.7.1" +version = "0.8.0" authors = [ "Nikolay Kim ", "Luca Palmieri ", diff --git a/actix-identity/README.md b/actix-identity/README.md index 1fa9cbaab..c01083d51 100644 --- a/actix-identity/README.md +++ b/actix-identity/README.md @@ -5,9 +5,9 @@ [![crates.io](https://img.shields.io/crates/v/actix-identity?label=latest)](https://crates.io/crates/actix-identity) -[![Documentation](https://docs.rs/actix-identity/badge.svg?version=0.7.1)](https://docs.rs/actix-identity/0.7.1) +[![Documentation](https://docs.rs/actix-identity/badge.svg?version=0.8.0)](https://docs.rs/actix-identity/0.8.0) ![Apache 2.0 or MIT licensed](https://img.shields.io/crates/l/actix-identity) -[![Dependency Status](https://deps.rs/crate/actix-identity/0.7.1/status.svg)](https://deps.rs/crate/actix-identity/0.7.1) +[![Dependency Status](https://deps.rs/crate/actix-identity/0.8.0/status.svg)](https://deps.rs/crate/actix-identity/0.8.0) From dd20ebb6cbe2e1e62dcb2b143d8c5e09b472123c Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 12 Sep 2024 15:10:28 -0400 Subject: [PATCH 7/7] chore: allow missing docs on test mod --- actix-session/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/actix-session/src/lib.rs b/actix-session/src/lib.rs index 2c45193b1..1ad600bab 100644 --- a/actix-session/src/lib.rs +++ b/actix-session/src/lib.rs @@ -148,6 +148,7 @@ pub use self::{ }; #[cfg(test)] +#[allow(missing_docs)] pub mod test_helpers { use actix_web::cookie::Key;