standardize future types to ones from actix_utils

actix-web-httpauth/Cargo.toml

@@ -18,10 +18,13 @@ name = "actix_web_httpauth"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = { version = "4.0.0-beta.10", default_features = false }
 actix-service = "2.0.0"
+actix-utils = "3"
+actix-web = { version = "4.0.0-beta.10", default_features = false }
+
 base64 = "0.13"
 futures-util = { version = "0.3.7", default-features = false }
+futures-core = { version = "0.3.7", default-features = false }
 pin-project-lite = "0.2.7"
 
 [dev-dependencies]

actix-web-httpauth/src/extractors/basic.rs

@@ -2,10 +2,10 @@
 
 use std::borrow::Cow;
 
+use actix_utils::future::{ready, Ready};
 use actix_web::dev::{Payload, ServiceRequest};
 use actix_web::http::header::Header;
 use actix_web::{FromRequest, HttpRequest};
-use futures_util::future::{ready, Ready};
 
 use super::config::AuthExtractorConfig;
 use super::errors::AuthenticationError;

actix-web-httpauth/src/extractors/bearer.rs

@@ -1,19 +1,17 @@
 //! Extractor for the "Bearer" HTTP Authentication Scheme
 
-use std::borrow::Cow;
-use std::default::Default;
+use std::{borrow::Cow, default::Default};
 
-use actix_web::dev::{Payload, ServiceRequest};
-use actix_web::http::header::Header;
-use actix_web::{FromRequest, HttpRequest};
-use futures_util::future::{ready, Ready};
+use actix_utils::future::{ready, Ready};
+use actix_web::{
+    dev::{Payload, ServiceRequest},
+    http::header::Header,
+    FromRequest, HttpRequest,
+};
 
-use super::config::AuthExtractorConfig;
-use super::errors::AuthenticationError;
-use super::AuthExtractor;
-use crate::headers::authorization;
-use crate::headers::www_authenticate::bearer;
+use super::{config::AuthExtractorConfig, errors::AuthenticationError, AuthExtractor};
 pub use crate::headers::www_authenticate::bearer::Error;
+use crate::headers::{authorization, www_authenticate::bearer};
 
 /// [BearerAuth](./struct/BearerAuth.html) extractor configuration.
 #[derive(Debug, Clone, Default)]

actix-web-httpauth/src/extractors/mod.rs

@@ -8,7 +8,7 @@ use std::{
 
 use actix_web::dev::ServiceRequest;
 use actix_web::Error;
-use futures_util::ready;
+use futures_core::ready;
 use pin_project_lite::pin_project;
 
 pub mod basic;

actix-web-httpauth/src/middleware.rs

@@ -1,7 +1,13 @@
 //! HTTP Authentication middleware.
 
 use std::{
-    error::Error as StdError, future::Future, marker::PhantomData, pin::Pin, rc::Rc, sync::Arc,
+    error::Error as StdError,
+    future::Future,
+    marker::PhantomData,
+    pin::Pin,
+    rc::Rc,
+    sync::Arc,
+    task::{Context, Poll},
 };
 
 use actix_web::{
@@ -9,11 +15,8 @@ use actix_web::{
     dev::{Service, ServiceRequest, ServiceResponse, Transform},
     Error,
 };
-use futures_util::{
-    future::{self, FutureExt as _, LocalBoxFuture, TryFutureExt as _},
-    ready,
-    task::{Context, Poll},
-};
+use futures_core::ready;
+use futures_util::future::{self, FutureExt as _, LocalBoxFuture, TryFutureExt as _};
 
 use crate::extractors::{basic, bearer, AuthExtractor};