standardize future types to ones from actix_utils

actix-session/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Sessions for Actix web"
 keywords = ["http", "web", "framework", "async", "session"]
 homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-extras"
+repository = "https://github.com/actix/actix-extras.git"
 license = "MIT OR Apache-2.0"
 edition = "2018"
 
@@ -18,8 +18,9 @@ default = ["cookie-session"]
 cookie-session = ["actix-web/secure-cookies"]
 
 [dependencies]
-actix-web = { version = "4.0.0-beta.10", default_features = false, features = ["cookies"] }
 actix-service = "2.0.0"
+actix-utils = "3"
+actix-web = { version = "4.0.0-beta.10", default_features = false, features = ["cookies"] }
 
 derive_more = "0.99.5"
 futures-util = { version = "0.3.7", default-features = false }

actix-session/src/cookie.rs

@@ -2,6 +2,7 @@
 
 use std::{collections::HashMap, error::Error as StdError, rc::Rc};
 
+use actix_utils::future::{ok, Ready};
 use actix_web::{
     body::{AnyBody, MessageBody},
     cookie::{Cookie, CookieJar, Key, SameSite},
@@ -10,7 +11,7 @@ use actix_web::{
     Error, ResponseError,
 };
 use derive_more::Display;
-use futures_util::future::{ok, FutureExt as _, LocalBoxFuture, Ready};
+use futures_util::future::{FutureExt as _, LocalBoxFuture};
 use serde_json::error::Error as JsonError;
 use time::{Duration, OffsetDateTime};
 

actix-session/src/lib.rs

@@ -49,11 +49,11 @@ use std::{
     rc::Rc,
 };
 
+use actix_utils::future::{ok, Ready};
 use actix_web::{
     dev::{Extensions, Payload, RequestHead, ServiceRequest, ServiceResponse},
     Error, FromRequest, HttpMessage, HttpRequest,
 };
-use futures_util::future::{ok, Ready};
 use serde::{de::DeserializeOwned, Serialize};
 
 #[cfg(feature = "cookie-session")]