1
0
mirror of https://github.com/fafhrd91/actix-web synced 2025-07-01 16:55:08 +02:00

migrate to -utils beta 4 (#2127)

This commit is contained in:
Rob Ede
2021-04-01 15:26:13 +01:00
committed by GitHub
parent a807d33600
commit c8ed8dd1a4
64 changed files with 612 additions and 210 deletions

View File

@ -10,7 +10,7 @@ use actix_service::boxed::{self, BoxServiceFactory};
use actix_service::{
apply, apply_fn_factory, IntoServiceFactory, ServiceFactory, ServiceFactoryExt, Transform,
};
use futures_util::future::FutureExt;
use futures_util::future::FutureExt as _;
use crate::app_service::{AppEntry, AppInit, AppRoutingFactory};
use crate::config::ServiceConfig;
@ -465,8 +465,8 @@ where
#[cfg(test)]
mod tests {
use actix_service::Service;
use actix_utils::future::{err, ok};
use bytes::Bytes;
use futures_util::future::{err, ok};
use super::*;
use crate::http::{header, HeaderValue, Method, StatusCode};

View File

@ -4,7 +4,8 @@ use std::sync::Arc;
use actix_http::error::{Error, ErrorInternalServerError};
use actix_http::Extensions;
use futures_util::future::{err, ok, LocalBoxFuture, Ready};
use actix_utils::future::{err, ok, Ready};
use futures_core::future::LocalBoxFuture;
use serde::Serialize;
use crate::dev::Payload;
@ -147,10 +148,10 @@ impl<T: ?Sized + 'static> DataFactory for Data<T> {
#[cfg(test)]
mod tests {
use actix_service::Service;
use std::sync::atomic::{AtomicUsize, Ordering};
use super::*;
use crate::dev::Service;
use crate::http::StatusCode;
use crate::test::{self, init_service, TestRequest};
use crate::{web, App, HttpResponse};

View File

@ -6,10 +6,8 @@ use std::{
task::{Context, Poll},
};
use futures_util::{
future::{ready, Ready},
ready,
};
use actix_utils::future::{ready, Ready};
use futures_core::ready;
use crate::{dev::Payload, Error, HttpRequest};

View File

@ -5,8 +5,8 @@ use std::task::{Context, Poll};
use actix_http::{Error, Response};
use actix_service::{Service, ServiceFactory};
use futures_util::future::{ready, Ready};
use futures_util::ready;
use actix_utils::future::{ready, Ready};
use futures_core::ready;
use pin_project::pin_project;
use crate::extract::FromRequest;

View File

@ -16,8 +16,8 @@ use actix_http::{
Error,
};
use actix_service::{Service, Transform};
use actix_utils::future::{ok, Ready};
use futures_core::ready;
use futures_util::future::{ok, Ready};
use pin_project::pin_project;
use crate::{

View File

@ -3,7 +3,9 @@
use std::task::{Context, Poll};
use actix_service::{Service, Transform};
use futures_util::future::{Either, FutureExt, LocalBoxFuture};
use actix_utils::future::Either;
use futures_core::future::LocalBoxFuture;
use futures_util::future::FutureExt as _;
/// Middleware for conditionally enabling other middleware.
///
@ -85,8 +87,8 @@ where
fn call(&self, req: Req) -> Self::Future {
match self {
ConditionMiddleware::Enable(service) => Either::Left(service.call(req)),
ConditionMiddleware::Disable(service) => Either::Right(service.call(req)),
ConditionMiddleware::Enable(service) => Either::left(service.call(req)),
ConditionMiddleware::Disable(service) => Either::right(service.call(req)),
}
}
}
@ -94,7 +96,7 @@ where
#[cfg(test)]
mod tests {
use actix_service::IntoService;
use futures_util::future::ok;
use actix_utils::future::ok;
use super::*;
use crate::{

View File

@ -9,10 +9,8 @@ use std::{
task::{Context, Poll},
};
use futures_util::{
future::{ready, Ready},
ready,
};
use actix_utils::future::{ready, Ready};
use futures_core::ready;
use crate::{
dev::{Service, Transform},
@ -188,7 +186,7 @@ where
#[cfg(test)]
mod tests {
use actix_service::IntoService;
use futures_util::future::ok;
use actix_utils::future::ok;
use super::*;
use crate::{

View File

@ -175,7 +175,8 @@ where
#[cfg(test)]
mod tests {
use actix_service::IntoService;
use futures_util::future::{ok, FutureExt};
use actix_utils::future::ok;
use futures_util::future::FutureExt as _;
use super::*;
use crate::http::{header::CONTENT_TYPE, HeaderValue, StatusCode};

View File

@ -13,8 +13,9 @@ use std::{
};
use actix_service::{Service, Transform};
use actix_utils::future::{ok, Ready};
use bytes::Bytes;
use futures_util::future::{ok, Ready};
use futures_core::ready;
use log::{debug, warn};
use regex::{Regex, RegexSet};
use time::OffsetDateTime;
@ -269,7 +270,7 @@ where
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let this = self.project();
let res = match futures_util::ready!(this.fut.poll(cx)) {
let res = match ready!(this.fut.poll(cx)) {
Ok(res) => res,
Err(e) => return Poll::Ready(Err(e)),
};
@ -588,7 +589,7 @@ impl<'a> fmt::Display for FormatDisplay<'a> {
#[cfg(test)]
mod tests {
use actix_service::{IntoService, Service, Transform};
use futures_util::future::ok;
use actix_utils::future::ok;
use super::*;
use crate::http::{header, StatusCode};

View File

@ -2,8 +2,8 @@
use actix_http::http::{PathAndQuery, Uri};
use actix_service::{Service, Transform};
use actix_utils::future::{ready, Ready};
use bytes::Bytes;
use futures_util::future::{ready, Ready};
use regex::Regex;
use crate::{

View File

@ -5,7 +5,7 @@ use std::{fmt, net};
use actix_http::http::{HeaderMap, Method, Uri, Version};
use actix_http::{Error, Extensions, HttpMessage, Message, Payload, RequestHead};
use actix_router::{Path, Url};
use futures_util::future::{ok, Ready};
use actix_utils::future::{ok, Ready};
use smallvec::SmallVec;
use crate::app_service::AppInitServiceState;

View File

@ -1,7 +1,7 @@
use std::{any::type_name, ops::Deref};
use actix_http::error::{Error, ErrorInternalServerError};
use futures_util::future;
use actix_utils::future::{err, ok, Ready};
use crate::{dev::Payload, FromRequest, HttpRequest};
@ -67,11 +67,11 @@ impl<T: Clone + 'static> Deref for ReqData<T> {
impl<T: Clone + 'static> FromRequest for ReqData<T> {
type Config = ();
type Error = Error;
type Future = future::Ready<Result<Self, Error>>;
type Future = Ready<Result<Self, Error>>;
fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
if let Some(st) = req.extensions().get::<T>() {
future::ok(ReqData(st.clone()))
ok(ReqData(st.clone()))
} else {
log::debug!(
"Failed to construct App-level ReqData extractor. \
@ -79,7 +79,7 @@ impl<T: Clone + 'static> FromRequest for ReqData<T> {
req.path(),
type_name::<T>(),
);
future::err(ErrorInternalServerError(
err(ErrorInternalServerError(
"Missing expected request extension data",
))
}

View File

@ -519,7 +519,7 @@ mod tests {
use actix_rt::time::sleep;
use actix_service::Service;
use futures_util::future::ok;
use actix_utils::future::ok;
use crate::http::{header, HeaderValue, Method, StatusCode};
use crate::middleware::DefaultHeaders;

View File

@ -575,8 +575,8 @@ impl ServiceFactory<ServiceRequest> for ScopeEndpoint {
#[cfg(test)]
mod tests {
use actix_service::Service;
use actix_utils::future::ok;
use bytes::Bytes;
use futures_util::future::ok;
use crate::dev::{Body, ResponseBody};
use crate::http::{header, HeaderValue, Method, StatusCode};

View File

@ -602,7 +602,7 @@ mod tests {
use crate::test::{init_service, TestRequest};
use crate::{guard, http, web, App, HttpResponse};
use actix_service::Service;
use futures_util::future::ok;
use actix_utils::future::ok;
#[actix_rt::test]
async fn test_service() {

View File

@ -15,12 +15,12 @@ use actix_http::{ws, Extensions, HttpService, Request};
use actix_router::{Path, ResourceDef, Url};
use actix_rt::{time::sleep, System};
use actix_service::{map_config, IntoService, IntoServiceFactory, Service, ServiceFactory};
use actix_utils::future::ok;
use awc::error::PayloadError;
use awc::{Client, ClientRequest, ClientResponse, Connector};
use bytes::{Bytes, BytesMut};
use futures_core::Stream;
use futures_util::future::ok;
use futures_util::StreamExt;
use futures_util::StreamExt as _;
use serde::de::DeserializeOwned;
use serde::Serialize;
use socket2::{Domain, Protocol, Socket, Type};

View File

@ -1,7 +1,8 @@
//! For either helper, see [`Either`].
use bytes::Bytes;
use futures_util::{future::LocalBoxFuture, FutureExt, TryFutureExt};
use futures_core::future::LocalBoxFuture;
use futures_util::{FutureExt as _, TryFutureExt as _};
use crate::{
dev,

View File

@ -12,10 +12,8 @@ use std::{
use actix_http::Payload;
use bytes::BytesMut;
use encoding_rs::{Encoding, UTF_8};
use futures_util::{
future::{FutureExt, LocalBoxFuture},
StreamExt,
};
use futures_core::future::LocalBoxFuture;
use futures_util::{FutureExt as _, StreamExt as _};
use serde::{de::DeserializeOwned, Serialize};
#[cfg(feature = "compress")]

View File

@ -11,7 +11,7 @@ use std::{
};
use bytes::BytesMut;
use futures_util::{ready, stream::Stream};
use futures_core::{ready, stream::Stream as _};
use serde::{de::DeserializeOwned, Serialize};
use actix_http::Payload;

View File

@ -4,7 +4,7 @@ use std::{fmt, ops, sync::Arc};
use actix_http::error::{Error, ErrorNotFound};
use actix_router::PathDeserializer;
use futures_util::future::{ready, Ready};
use actix_utils::future::{ready, Ready};
use serde::de;
use crate::{dev::Payload, error::PathError, FromRequest, HttpRequest};

View File

@ -8,13 +8,10 @@ use std::{
};
use actix_http::error::{ErrorBadRequest, PayloadError};
use actix_utils::future::{ready, Either, Ready};
use bytes::{Bytes, BytesMut};
use encoding_rs::{Encoding, UTF_8};
use futures_core::stream::Stream;
use futures_util::{
future::{ready, Either, ErrInto, Ready, TryFutureExt as _},
ready,
};
use futures_core::{ready, stream::Stream};
use mime::Mime;
use crate::{dev, http::header, web, Error, FromRequest, HttpMessage, HttpRequest};
@ -26,7 +23,7 @@ use crate::{dev, http::header, web, Error, FromRequest, HttpMessage, HttpRequest
/// # Examples
/// ```
/// use std::future::Future;
/// use futures_util::stream::{Stream, StreamExt};
/// use futures_util::stream::StreamExt as _;
/// use actix_web::{post, web};
///
/// // `body: web::Payload` parameter extracts raw payload stream from request
@ -91,7 +88,7 @@ impl FromRequest for Payload {
impl FromRequest for Bytes {
type Config = PayloadConfig;
type Error = Error;
type Future = Either<ErrInto<HttpMessageBody, Error>, Ready<Result<Bytes, Error>>>;
type Future = Either<BytesExtractFut, Ready<Result<Bytes, Error>>>;
#[inline]
fn from_request(req: &HttpRequest, payload: &mut dev::Payload) -> Self::Future {
@ -99,12 +96,25 @@ impl FromRequest for Bytes {
let cfg = PayloadConfig::from_req(req);
if let Err(err) = cfg.check_mimetype(req) {
return Either::Right(ready(Err(err)));
return Either::right(ready(Err(err)));
}
let limit = cfg.limit;
let fut = HttpMessageBody::new(req, payload).limit(limit);
Either::Left(fut.err_into())
Either::left(BytesExtractFut {
body_fut: HttpMessageBody::new(req, payload).limit(cfg.limit),
})
}
}
/// Future for `Bytes` extractor.
pub struct BytesExtractFut {
body_fut: HttpMessageBody,
}
impl<'a> Future for BytesExtractFut {
type Output = Result<Bytes, Error>;
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
Pin::new(&mut self.body_fut).poll(cx).map_err(Into::into)
}
}
@ -135,21 +145,22 @@ impl FromRequest for String {
// check content-type
if let Err(err) = cfg.check_mimetype(req) {
return Either::Right(ready(Err(err)));
return Either::right(ready(Err(err)));
}
// check charset
let encoding = match req.encoding() {
Ok(enc) => enc,
Err(err) => return Either::Right(ready(Err(err.into()))),
Err(err) => return Either::right(ready(Err(err.into()))),
};
let limit = cfg.limit;
let body_fut = HttpMessageBody::new(req, payload).limit(limit);
Either::Left(StringExtractFut { body_fut, encoding })
Either::left(StringExtractFut { body_fut, encoding })
}
}
/// Future for `String` extractor.
pub struct StringExtractFut {
body_fut: HttpMessageBody,
encoding: &'static Encoding,

View File

@ -2,7 +2,7 @@
use std::{fmt, ops, sync::Arc};
use futures_util::future::{err, ok, Ready};
use actix_utils::future::{err, ok, Ready};
use serde::de;
use crate::{dev::Payload, error::QueryPayloadError, Error, FromRequest, HttpRequest};

View File

@ -177,7 +177,7 @@ where
#[cfg(test)]
mod tests {
use futures_util::stream::StreamExt;
use futures_util::stream::StreamExt as _;
use super::*;
use crate::test::TestRequest;