From b95dd9f19358afb9e8b3ca896825765a6fba1460 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sat, 30 Mar 2019 08:21:47 -0700
Subject: [PATCH] update actix-web

---
 Cargo.toml     | 7 +++----
 src/lib.rs     | 2 +-
 src/session.rs | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9ee01175d..df9dc456c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,7 @@ codecov = { repository = "actix/actix-redis", branch = "master", service = "gith
 default = ["web"]
 
 # actix-web integration
-web = ["actix/http", "actix-service", "actix-utils", "actix-web/cookies", "actix-session", "cookie", "rand", "serde", "serde_json"]
+web = ["actix/http", "actix-service", "actix-utils", "actix-web", "actix-session/cookie-session", "rand", "serde", "serde_json"]
 
 [dependencies]
 actix = "0.8.0-alpha.2"
@@ -41,11 +41,10 @@ redis-async = "0.4"
 time = "0.1"
 
 # actix web session
-actix-web = { version = "1.0.0-alpha.1", optional=true }
+actix-web = { version = "1.0.0-alpha.2", optional=true }
 actix-utils = { version = "0.3.3", optional=true }
 actix-service = { version = "0.3.4", optional=true }
-actix-session = { version = "0.1.0-alpha.1", optional=true }
-cookie = { version="0.11", features=["percent-encode", "secure"], optional=true }
+actix-session = { version = "0.1.0-alpha.2", optional=true }
 rand = { version="0.6.5", optional=true }
 serde = { version="1.0", optional=true }
 serde_json = { version="1.0", optional=true }
diff --git a/src/lib.rs b/src/lib.rs
index baa446c3b..11a03dd26 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -20,7 +20,7 @@ pub use redis::{Command, RedisActor};
 #[cfg(feature = "web")]
 mod session;
 #[cfg(feature = "web")]
-pub use cookie::SameSite;
+pub use actix_web::cookie::SameSite;
 #[cfg(feature = "web")]
 pub use session::RedisSession;
 
diff --git a/src/session.rs b/src/session.rs
index 2b1ebbbcf..b36ea0ff0 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -6,10 +6,10 @@ use actix::prelude::*;
 use actix_service::{Service, Transform};
 use actix_session::Session;
 use actix_utils::cloneable::CloneableService;
+use actix_web::cookie::{Cookie, CookieJar, Key, SameSite};
 use actix_web::dev::{ServiceRequest, ServiceResponse};
 use actix_web::http::header::{self, HeaderValue};
 use actix_web::{error, Error, HttpMessage};
-use cookie::{Cookie, CookieJar, Key, SameSite};
 use futures::future::{err, ok, Either, Future, FutureResult};
 use futures::Poll;
 use rand::{distributions::Alphanumeric, rngs::OsRng, Rng};