actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-06-26 10:27:42 +02:00
Code Issues Releases Wiki Activity

standardize future types to ones from actix_utils

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
actix-identity/Cargo.toml
View File

@ -5,7 +5,7 @@ authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Identity service for Actix web"
keywords = ["actix", "auth", "identity", "web", "security"]
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"
@ -15,6 +15,7 @@ path = "src/lib.rs"
[dependencies]
actix-service = "2.0.0"
actix-utils = "3"
actix-web = { version = "4.0.0-beta.10", default-features = false, features = ["cookies", "secure-cookies"] }
futures-util = { version = "0.3.7", default-features = false }
serde = "1.0"

2
actix-identity/src/cookie.rs
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;

2
actix-identity/src/identity.rs
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>,

6
actix-identity/src/middleware.rs
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 {