1
0
mirror of https://github.com/actix/actix-extras.git synced 2025-06-26 18:37:41 +02:00

standardize future types to ones from actix_utils

This commit is contained in:
Rob Ede
2021-12-08 07:29:12 +00:00
parent ec66754c0d
commit 56051786a6
19 changed files with 51 additions and 40 deletions

View File

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

View File

@ -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")]