From ecc774450fcf965360578ca330a8cc0be508b934 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sun, 17 May 2020 11:08:46 +0900 Subject: [PATCH] Follow upstream change wrt. `FramedWrite` --- actix-redis/CHANGES.md | 8 ++++++-- actix-redis/Cargo.toml | 8 ++++---- actix-redis/src/redis.rs | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/actix-redis/CHANGES.md b/actix-redis/CHANGES.md index 065dd7581..9281c037c 100644 --- a/actix-redis/CHANGES.md +++ b/actix-redis/CHANGES.md @@ -2,10 +2,14 @@ ## [Unreleased] -* Added `cookie_http_only` functionality to RedisSession builder, setting this +* Add `cookie_http_only` functionality to RedisSession builder, setting this to false allows JavaScript to access cookies. Defaults to true. -* Changed type of parameter of ttl method to u32. +* Change type of parameter of ttl method to u32. + +* Update `actix` to 0.10.0-alpha.3 + +* Update `tokio-util` to 0.3 ## [0.9.0-alpha.1] diff --git a/actix-redis/Cargo.toml b/actix-redis/Cargo.toml index bc3f0d955..3b30e73cf 100644 --- a/actix-redis/Cargo.toml +++ b/actix-redis/Cargo.toml @@ -24,7 +24,7 @@ default = ["web"] web = ["actix-http/actors", "actix-service", "actix-web", "actix-session/cookie-session", "rand", "serde", "serde_json"] [dependencies] -actix = "0.10.0-alpha.2" +actix = "0.10.0-alpha.3" actix-utils = "1.0.3" log = "0.4.6" @@ -35,11 +35,11 @@ redis-async = "0.6.1" actix-rt = "1.0.0" time = "0.2.9" tokio = "0.2.6" -tokio-util = "0.2.0" +tokio-util = "0.3.0" # actix-session -actix-web = { version = "3.0.0-alpha.1", optional = true } -actix-http = { version = "2.0.0-alpha.2", optional = true } +actix-web = { version = "3.0.0-alpha.2", optional = true } +actix-http = { version = "2.0.0-alpha.3", optional = true } actix-service = { version = "1.0.0", optional = true } actix-session = { version = "0.4.0-alpha.1", optional = true } rand = { version = "0.7.0", optional = true } diff --git a/actix-redis/src/redis.rs b/actix-redis/src/redis.rs index 6a4c81a3f..c62f9fedf 100644 --- a/actix-redis/src/redis.rs +++ b/actix-redis/src/redis.rs @@ -27,7 +27,7 @@ impl Message for Command { pub struct RedisActor { addr: String, backoff: ExponentialBackoff, - cell: Option, RespCodec>>, + cell: Option, RespCodec>>, queue: VecDeque>>, }