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

2
actix-cors/src/builder.rs
View File

@ -2,6 +2,7 @@ use std::{
collections::HashSet, convert::TryInto, error::Error as StdError, iter::FromIterator, rc::Rc,
};
use actix_utils::future::{self, Ready};
use actix_web::{
body::MessageBody,
dev::{RequestHead, Service, ServiceRequest, ServiceResponse, Transform},
@ -9,7 +10,6 @@ use actix_web::{
http::{self, header::HeaderName, Error as HttpError, HeaderValue, Method, Uri},
Either,
};
use futures_util::future::{self, Ready};
use log::error;
use once_cell::sync::Lazy;
use smallvec::smallvec;

9
actix-cors/src/middleware.rs
View File

@ -1,5 +1,6 @@
use std::{collections::HashSet, convert::TryInto, error::Error as StdError, rc::Rc};
use actix_utils::future::{ok, Either, Ready};
use actix_web::{
body::{AnyBody, MessageBody},
dev::{Service, ServiceRequest, ServiceResponse},
@ -10,7 +11,7 @@ use actix_web::{
},
HttpResponse,
};
use futures_util::future::{ok, Either, FutureExt as _, LocalBoxFuture, Ready, TryFutureExt as _};
use futures_util::future::{FutureExt as _, LocalBoxFuture, TryFutureExt as _};
use log::debug;
use crate::{builder::intersperse_header_values, AllOrSome, Inner};
@ -155,7 +156,7 @@ where
if self.inner.preflight && req.method() == Method::OPTIONS {
let inner = Rc::clone(&self.inner);
let res = Self::handle_preflight(&inner, req);
Either::Left(ok(res))
Either::left(ok(res))
} else {
let origin = req.headers().get(header::ORIGIN).cloned();
@ -163,7 +164,7 @@ where
// Only check requests with a origin header.
if let Err(err) = self.inner.validate_origin(req.head()) {
debug!("origin validation failed; inner service is not called");
return Either::Left(ok(req.error_response(err)));
return Either::left(ok(req.error_response(err)));
}
}
@ -183,7 +184,7 @@ where
.map_ok(|res| res.map_body(|_, body| AnyBody::new_boxed(body)))
.boxed_local();
Either::Right(res)
Either::right(res)
}
}
}