From bc36cc11590e3d51f43b81692ddf652ea6503554 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sun, 15 Mar 2020 06:58:47 +0900 Subject: [PATCH 1/3] Minimize `futures` dependency --- actix-session/CHANGES.md | 1 + actix-session/Cargo.toml | 2 +- actix-session/src/cookie.rs | 2 +- actix-session/src/lib.rs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/actix-session/CHANGES.md b/actix-session/CHANGES.md index e480f1d3e..84966bf55 100644 --- a/actix-session/CHANGES.md +++ b/actix-session/CHANGES.md @@ -5,6 +5,7 @@ * Update the `time` dependency to 0.2.7 * Update the `actix-web` dependency to 3.0.0-alpha.1 * Long lasting auto-prolonged session [#1292] +* Minimize `futures` dependency [#1292]: https://github.com/actix/actix-web/pull/1292 diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index 9fe297576..312c2e7e8 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -26,7 +26,7 @@ actix-web = "3.0.0-alpha.1" actix-service = "1.0.1" bytes = "0.5.3" derive_more = "0.99.2" -futures = "0.3.1" +futures-util = { version = "0.3.4", default-features = false } serde = "1.0" serde_json = "1.0" time = { version = "0.2.7", default-features = false, features = ["std"] } diff --git a/actix-session/src/cookie.rs b/actix-session/src/cookie.rs index b5297f561..7886d637b 100644 --- a/actix-session/src/cookie.rs +++ b/actix-session/src/cookie.rs @@ -25,7 +25,7 @@ use actix_web::dev::{ServiceRequest, ServiceResponse}; use actix_web::http::{header::SET_COOKIE, HeaderValue}; use actix_web::{Error, HttpMessage, ResponseError}; use derive_more::{Display, From}; -use futures::future::{ok, FutureExt, LocalBoxFuture, Ready}; +use futures_util::future::{ok, FutureExt, LocalBoxFuture, Ready}; use serde_json::error::Error as JsonError; use time::{Duration, OffsetDateTime}; diff --git a/actix-session/src/lib.rs b/actix-session/src/lib.rs index c75ff0968..24e6eb9ae 100644 --- a/actix-session/src/lib.rs +++ b/actix-session/src/lib.rs @@ -49,7 +49,7 @@ use actix_web::dev::{ Extensions, Payload, RequestHead, ServiceRequest, ServiceResponse, }; use actix_web::{Error, FromRequest, HttpMessage, HttpRequest}; -use futures::future::{ok, Ready}; +use futures_util::future::{ok, Ready}; use serde::de::DeserializeOwned; use serde::Serialize; use serde_json; From 510be85629c8e9442fa9495c4a2564bc8ed4419d Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sun, 15 Mar 2020 06:59:41 +0900 Subject: [PATCH 2/3] Fix style --- actix-session/src/cookie.rs | 48 ++++++++++++++----------------------- actix-session/src/lib.rs | 1 - 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/actix-session/src/cookie.rs b/actix-session/src/cookie.rs index 7886d637b..dc3011419 100644 --- a/actix-session/src/cookie.rs +++ b/actix-session/src/cookie.rs @@ -391,11 +391,9 @@ mod tests { let mut app = test::init_service( App::new() .wrap(CookieSession::signed(&[0; 32]).secure(false)) - .service(web::resource("/").to(|ses: Session| { - async move { - let _ = ses.set("counter", 100); - "test" - } + .service(web::resource("/").to(|ses: Session| async move { + let _ = ses.set("counter", 100); + "test" })), ) .await; @@ -414,11 +412,9 @@ mod tests { let mut app = test::init_service( App::new() .wrap(CookieSession::private(&[0; 32]).secure(false)) - .service(web::resource("/").to(|ses: Session| { - async move { - let _ = ses.set("counter", 100); - "test" - } + .service(web::resource("/").to(|ses: Session| async move { + let _ = ses.set("counter", 100); + "test" })), ) .await; @@ -437,11 +433,9 @@ mod tests { let mut app = test::init_service( App::new() .wrap(CookieSession::signed(&[0; 32]).secure(false)) - .service(web::resource("/").to(|ses: Session| { - async move { - let _ = ses.set("counter", 100); - "test" - } + .service(web::resource("/").to(|ses: Session| async move { + let _ = ses.set("counter", 100); + "test" })), ) .await; @@ -468,17 +462,13 @@ mod tests { .same_site(SameSite::Lax) .max_age(100), ) - .service(web::resource("/").to(|ses: Session| { - async move { - let _ = ses.set("counter", 100); - "test" - } + .service(web::resource("/").to(|ses: Session| async move { + let _ = ses.set("counter", 100); + "test" })) - .service(web::resource("/test/").to(|ses: Session| { - async move { - let val: usize = ses.get("counter").unwrap().unwrap(); - format!("counter: {}", val) - } + .service(web::resource("/test/").to(|ses: Session| async move { + let val: usize = ses.get("counter").unwrap().unwrap(); + format!("counter: {}", val) })), ) .await; @@ -505,11 +495,9 @@ mod tests { let mut app = test::init_service( App::new() .wrap(CookieSession::signed(&[0; 32]).secure(false).expires_in(60)) - .service(web::resource("/").to(|ses: Session| { - async move { - let _ = ses.set("counter", 100); - "test" - } + .service(web::resource("/").to(|ses: Session| async move { + let _ = ses.set("counter", 100); + "test" })) .service( web::resource("/test/") diff --git a/actix-session/src/lib.rs b/actix-session/src/lib.rs index 24e6eb9ae..a08003509 100644 --- a/actix-session/src/lib.rs +++ b/actix-session/src/lib.rs @@ -52,7 +52,6 @@ use actix_web::{Error, FromRequest, HttpMessage, HttpRequest}; use futures_util::future::{ok, Ready}; use serde::de::DeserializeOwned; use serde::Serialize; -use serde_json; #[cfg(feature = "cookie-session")] mod cookie; From 483f641165757c794f37afaaa0cf769e20c401b0 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sun, 15 Mar 2020 07:01:21 +0900 Subject: [PATCH 3/3] Bump up to 0.4.0-alpha.1 --- actix-session/CHANGES.md | 2 +- actix-session/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actix-session/CHANGES.md b/actix-session/CHANGES.md index 84966bf55..ba51f4c8f 100644 --- a/actix-session/CHANGES.md +++ b/actix-session/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## [0.4.0-alpha.1] - 2020-03-12 +## [0.4.0-alpha.1] - 2020-03-14 * Update the `time` dependency to 0.2.7 * Update the `actix-web` dependency to 3.0.0-alpha.1 diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index 312c2e7e8..1626d74f4 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-session" -version = "0.3.0" +version = "0.4.0-alpha.1" authors = ["Nikolay Kim "] description = "Session for actix-web framework." readme = "README.md"