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

@ -1,6 +1,6 @@
use std::{rc::Rc, time::SystemTime};
use futures_util::future::{ready, Ready};
use actix_utils::future::{ready, Ready};
use serde::{Deserialize, Serialize};
use time::Duration;

View File

@ -2,7 +2,7 @@ use actix_web::{
dev::{Extensions, Payload},
Error, FromRequest, HttpRequest,
};
use futures_util::future::{ready, Ready};
use actix_utils::future::{ready, Ready};
pub(crate) struct IdentityItem {
pub(crate) id: Option<String>,

View File

@ -1,11 +1,12 @@
use std::{error::Error as StdError, rc::Rc};
use actix_utils::future::{ready, Ready};
use actix_web::{
body::{AnyBody, MessageBody},
dev::{Service, ServiceRequest, ServiceResponse, Transform},
Error, HttpMessage, Result,
};
use futures_util::future::{ready, FutureExt as _, LocalBoxFuture, Ready, TryFutureExt as _};
use futures_util::future::{FutureExt as _, LocalBoxFuture, TryFutureExt as _};
use crate::{identity::IdentityItem, IdentityPolicy};
@ -129,7 +130,8 @@ mod tests {
#[actix_rt::test]
async fn test_borrowed_mut_error() {
use futures_util::future::{lazy, ok, Ready};
use actix_utils::future::{ok, Ready};
use futures_util::future::lazy;
struct Ident;
impl IdentityPolicy for Ident {