1
0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-27 09:12:57 +01:00

Merge branch 'master' into implement-contains-key-update-update-or

This commit is contained in:
Keith Cirkel 2024-09-17 09:55:04 +01:00 committed by GitHub
commit ae021a61a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 25 additions and 21 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -2,6 +2,8 @@
## Unreleased
## 0.8.0
- Update `actix-session` dependency to `0.10`.
## 0.7.1

View File

@ -1,6 +1,6 @@
[package]
name = "actix-identity"
version = "0.7.1"
version = "0.8.0"
authors = [
"Nikolay Kim <fafhrd91@gmail.com>",
"Luca Palmieri <rust@lpalmieri.com>",

View File

@ -5,9 +5,9 @@
<!-- prettier-ignore-start -->
[![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)
<!-- prettier-ignore-end -->

View File

@ -6,6 +6,10 @@
- Add `session.update_or(key, updater, default_value)`
- Add `session.contains_key(key)`
## 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.

View File

@ -1,6 +1,6 @@
[package]
name = "actix-session"
version = "0.10.0"
version = "0.10.1"
authors = [
"Nikolay Kim <fafhrd91@gmail.com>",
"Luca Palmieri <rust@lpalmieri.com>",
@ -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"] }

View File

@ -5,9 +5,9 @@
<!-- prettier-ignore-start -->
[![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)
<!-- prettier-ignore-end -->

View File

@ -148,6 +148,7 @@ pub use self::{
};
#[cfg(test)]
#[allow(missing_docs)]
pub mod test_helpers {
use actix_web::cookie::Key;

View File

@ -6,17 +6,14 @@ mod interface;
#[cfg(feature = "redis-session")]
mod redis_rs;
mod session_key;
#[cfg(feature = "redis-session")]
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,
};

View File

@ -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,