mirror of
https://github.com/fafhrd91/actix-web
synced 2025-06-25 22:49:21 +02:00
cleanup deprecation warning for Box<dyn>
This commit is contained in:
@ -23,7 +23,7 @@ type HttpService = BoxedService<ServiceRequest, ServiceResponse, Error>;
|
||||
type HttpNewService = BoxedNewService<(), ServiceRequest, ServiceResponse, Error, ()>;
|
||||
type BoxedResponse = Either<
|
||||
FutureResult<ServiceResponse, Error>,
|
||||
Box<Future<Item = ServiceResponse, Error = Error>>,
|
||||
Box<dyn Future<Item = ServiceResponse, Error = Error>>,
|
||||
>;
|
||||
type FnDataFactory = Box<Fn() -> Box<dyn Future<Item = Box<DataFactory>, Error = ()>>>;
|
||||
|
||||
@ -297,14 +297,14 @@ impl NewService for AppRoutingFactory {
|
||||
}
|
||||
}
|
||||
|
||||
type HttpServiceFut = Box<Future<Item = HttpService, Error = ()>>;
|
||||
type HttpServiceFut = Box<dyn Future<Item = HttpService, Error = ()>>;
|
||||
|
||||
/// Create app service
|
||||
#[doc(hidden)]
|
||||
pub struct AppRoutingFactoryResponse {
|
||||
fut: Vec<CreateAppRoutingItem>,
|
||||
default: Option<HttpService>,
|
||||
default_fut: Option<Box<Future<Item = HttpService, Error = ()>>>,
|
||||
default_fut: Option<Box<dyn Future<Item = HttpService, Error = ()>>>,
|
||||
}
|
||||
|
||||
enum CreateAppRoutingItem {
|
||||
|
@ -94,7 +94,7 @@ where
|
||||
{
|
||||
type Config = T::Config;
|
||||
type Error = Error;
|
||||
type Future = Box<Future<Item = Option<T>, Error = Error>>;
|
||||
type Future = Box<dyn Future<Item = Option<T>, Error = Error>>;
|
||||
|
||||
#[inline]
|
||||
fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
|
||||
@ -165,7 +165,7 @@ where
|
||||
{
|
||||
type Config = T::Config;
|
||||
type Error = Error;
|
||||
type Future = Box<Future<Item = Result<T, T::Error>, Error = Error>>;
|
||||
type Future = Box<dyn Future<Item = Result<T, T::Error>, Error = Error>>;
|
||||
|
||||
#[inline]
|
||||
fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
|
||||
|
@ -119,7 +119,7 @@ where
|
||||
type Request = ServiceRequest;
|
||||
type Response = ServiceResponse<B>;
|
||||
type Error = Error;
|
||||
type Future = Box<Future<Item = Self::Response, Error = Self::Error>>;
|
||||
type Future = Box<dyn Future<Item = Self::Response, Error = Self::Error>>;
|
||||
|
||||
fn poll_ready(&mut self) -> Poll<(), Self::Error> {
|
||||
self.service.poll_ready()
|
||||
|
@ -15,7 +15,7 @@ pub enum ErrorHandlerResponse<B> {
|
||||
/// New http response got generated
|
||||
Response(ServiceResponse<B>),
|
||||
/// Result is a future that resolves to a new http response
|
||||
Future(Box<Future<Item = ServiceResponse<B>, Error = Error>>),
|
||||
Future(Box<dyn Future<Item = ServiceResponse<B>, Error = Error>>),
|
||||
}
|
||||
|
||||
type ErrorHandler<B> = Fn(ServiceResponse<B>) -> Result<ErrorHandlerResponse<B>>;
|
||||
@ -117,7 +117,7 @@ where
|
||||
type Request = ServiceRequest;
|
||||
type Response = ServiceResponse<B>;
|
||||
type Error = Error;
|
||||
type Future = Box<Future<Item = Self::Response, Error = Self::Error>>;
|
||||
type Future = Box<dyn Future<Item = Self::Response, Error = Self::Error>>;
|
||||
|
||||
fn poll_ready(&mut self) -> Poll<(), Self::Error> {
|
||||
self.service.poll_ready()
|
||||
|
@ -245,7 +245,7 @@ where
|
||||
/// ```rust
|
||||
/// # use actix_web::*;
|
||||
/// # use futures::future::Future;
|
||||
/// # fn index(req: HttpRequest) -> Box<Future<Item=HttpResponse, Error=Error>> {
|
||||
/// # fn index(req: HttpRequest) -> Box<dyn Future<Item=HttpResponse, Error=Error>> {
|
||||
/// # unimplemented!()
|
||||
/// # }
|
||||
/// App::new().service(web::resource("/").route(web::route().to_async(index)));
|
||||
@ -478,7 +478,7 @@ pub struct CreateResourceService {
|
||||
fut: Vec<CreateRouteServiceItem>,
|
||||
data: Option<Rc<Extensions>>,
|
||||
default: Option<HttpService>,
|
||||
default_fut: Option<Box<Future<Item = HttpService, Error = ()>>>,
|
||||
default_fut: Option<Box<dyn Future<Item = HttpService, Error = ()>>>,
|
||||
}
|
||||
|
||||
impl Future for CreateResourceService {
|
||||
@ -542,7 +542,7 @@ impl Service for ResourceService {
|
||||
type Error = Error;
|
||||
type Future = Either<
|
||||
FutureResult<ServiceResponse, Error>,
|
||||
Box<Future<Item = ServiceResponse, Error = Error>>,
|
||||
Box<dyn Future<Item = ServiceResponse, Error = Error>>,
|
||||
>;
|
||||
|
||||
fn poll_ready(&mut self) -> Poll<(), Self::Error> {
|
||||
|
@ -337,7 +337,7 @@ impl<T: Responder> Future for CustomResponderFut<T> {
|
||||
/// use actix_web::{Either, Error, HttpResponse};
|
||||
///
|
||||
/// type RegisterResult =
|
||||
/// Either<HttpResponse, Box<Future<Item = HttpResponse, Error = Error>>>;
|
||||
/// Either<HttpResponse, Box<dyn Future<Item = HttpResponse, Error = Error>>>;
|
||||
///
|
||||
/// fn index() -> RegisterResult {
|
||||
/// if is_a_variant() {
|
||||
@ -411,13 +411,13 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
impl<I, E> Responder for Box<Future<Item = I, Error = E>>
|
||||
impl<I, E> Responder for Box<dyn Future<Item = I, Error = E>>
|
||||
where
|
||||
I: Responder + 'static,
|
||||
E: Into<Error> + 'static,
|
||||
{
|
||||
type Error = Error;
|
||||
type Future = Box<Future<Item = Response, Error = Error>>;
|
||||
type Future = Box<dyn Future<Item = Response, Error = Error>>;
|
||||
|
||||
#[inline]
|
||||
fn respond_to(self, req: &HttpRequest) -> Self::Future {
|
||||
|
15
src/route.rs
15
src/route.rs
@ -19,7 +19,7 @@ type BoxedRouteService<Req, Res> = Box<
|
||||
Error = Error,
|
||||
Future = Either<
|
||||
FutureResult<Res, Error>,
|
||||
Box<Future<Item = Res, Error = Error>>,
|
||||
Box<dyn Future<Item = Res, Error = Error>>,
|
||||
>,
|
||||
>,
|
||||
>;
|
||||
@ -32,7 +32,7 @@ type BoxedRouteNewService<Req, Res> = Box<
|
||||
Error = Error,
|
||||
InitError = (),
|
||||
Service = BoxedRouteService<Req, Res>,
|
||||
Future = Box<Future<Item = BoxedRouteService<Req, Res>, Error = ()>>,
|
||||
Future = Box<dyn Future<Item = BoxedRouteService<Req, Res>, Error = ()>>,
|
||||
>,
|
||||
>;
|
||||
|
||||
@ -78,8 +78,9 @@ impl NewService for Route {
|
||||
}
|
||||
}
|
||||
|
||||
type RouteFuture =
|
||||
Box<Future<Item = BoxedRouteService<ServiceRequest, ServiceResponse>, Error = ()>>;
|
||||
type RouteFuture = Box<
|
||||
dyn Future<Item = BoxedRouteService<ServiceRequest, ServiceResponse>, Error = ()>,
|
||||
>;
|
||||
|
||||
pub struct CreateRouteService {
|
||||
fut: RouteFuture,
|
||||
@ -123,7 +124,7 @@ impl Service for RouteService {
|
||||
type Error = Error;
|
||||
type Future = Either<
|
||||
FutureResult<Self::Response, Self::Error>,
|
||||
Box<Future<Item = Self::Response, Error = Self::Error>>,
|
||||
Box<dyn Future<Item = Self::Response, Error = Self::Error>>,
|
||||
>;
|
||||
|
||||
fn poll_ready(&mut self) -> Poll<(), Self::Error> {
|
||||
@ -317,7 +318,7 @@ where
|
||||
type Error = Error;
|
||||
type InitError = ();
|
||||
type Service = BoxedRouteService<ServiceRequest, Self::Response>;
|
||||
type Future = Box<Future<Item = Self::Service, Error = Self::InitError>>;
|
||||
type Future = Box<dyn Future<Item = Self::Service, Error = Self::InitError>>;
|
||||
|
||||
fn new_service(&self, _: &()) -> Self::Future {
|
||||
Box::new(
|
||||
@ -351,7 +352,7 @@ where
|
||||
type Error = Error;
|
||||
type Future = Either<
|
||||
FutureResult<Self::Response, Self::Error>,
|
||||
Box<Future<Item = Self::Response, Error = Self::Error>>,
|
||||
Box<dyn Future<Item = Self::Response, Error = Self::Error>>,
|
||||
>;
|
||||
|
||||
fn poll_ready(&mut self) -> Poll<(), Self::Error> {
|
||||
|
@ -28,7 +28,7 @@ type HttpService = BoxedService<ServiceRequest, ServiceResponse, Error>;
|
||||
type HttpNewService = BoxedNewService<(), ServiceRequest, ServiceResponse, Error, ()>;
|
||||
type BoxedResponse = Either<
|
||||
FutureResult<ServiceResponse, Error>,
|
||||
Box<Future<Item = ServiceResponse, Error = Error>>,
|
||||
Box<dyn Future<Item = ServiceResponse, Error = Error>>,
|
||||
>;
|
||||
|
||||
/// Resources scope.
|
||||
@ -503,10 +503,10 @@ pub struct ScopeFactoryResponse {
|
||||
fut: Vec<CreateScopeServiceItem>,
|
||||
data: Option<Rc<Extensions>>,
|
||||
default: Option<HttpService>,
|
||||
default_fut: Option<Box<Future<Item = HttpService, Error = ()>>>,
|
||||
default_fut: Option<Box<dyn Future<Item = HttpService, Error = ()>>>,
|
||||
}
|
||||
|
||||
type HttpServiceFut = Box<Future<Item = HttpService, Error = ()>>;
|
||||
type HttpServiceFut = Box<dyn Future<Item = HttpService, Error = ()>>;
|
||||
|
||||
enum CreateScopeServiceItem {
|
||||
Future(Option<ResourceDef>, Option<Guards>, HttpServiceFut),
|
||||
|
@ -73,7 +73,7 @@ where
|
||||
{
|
||||
type Config = FormConfig;
|
||||
type Error = Error;
|
||||
type Future = Box<Future<Item = Self, Error = Error>>;
|
||||
type Future = Box<dyn Future<Item = Self, Error = Error>>;
|
||||
|
||||
#[inline]
|
||||
fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
|
||||
@ -187,7 +187,7 @@ pub struct UrlEncoded<U> {
|
||||
length: Option<usize>,
|
||||
encoding: &'static Encoding,
|
||||
err: Option<UrlencodedError>,
|
||||
fut: Option<Box<Future<Item = U, Error = UrlencodedError>>>,
|
||||
fut: Option<Box<dyn Future<Item = U, Error = UrlencodedError>>>,
|
||||
}
|
||||
|
||||
impl<U> UrlEncoded<U> {
|
||||
|
@ -169,7 +169,7 @@ where
|
||||
T: DeserializeOwned + 'static,
|
||||
{
|
||||
type Error = Error;
|
||||
type Future = Box<Future<Item = Self, Error = Error>>;
|
||||
type Future = Box<dyn Future<Item = Self, Error = Error>>;
|
||||
type Config = JsonConfig;
|
||||
|
||||
#[inline]
|
||||
@ -290,7 +290,7 @@ pub struct JsonBody<U> {
|
||||
length: Option<usize>,
|
||||
stream: Option<Decompress<Payload>>,
|
||||
err: Option<JsonPayloadError>,
|
||||
fut: Option<Box<Future<Item = U, Error = JsonPayloadError>>>,
|
||||
fut: Option<Box<dyn Future<Item = U, Error = JsonPayloadError>>>,
|
||||
}
|
||||
|
||||
impl<U> JsonBody<U>
|
||||
|
@ -124,7 +124,7 @@ impl FromRequest for Bytes {
|
||||
type Config = PayloadConfig;
|
||||
type Error = Error;
|
||||
type Future =
|
||||
Either<Box<Future<Item = Bytes, Error = Error>>, FutureResult<Bytes, Error>>;
|
||||
Either<Box<dyn Future<Item = Bytes, Error = Error>>, FutureResult<Bytes, Error>>;
|
||||
|
||||
#[inline]
|
||||
fn from_request(req: &HttpRequest, payload: &mut dev::Payload) -> Self::Future {
|
||||
@ -177,8 +177,10 @@ impl FromRequest for Bytes {
|
||||
impl FromRequest for String {
|
||||
type Config = PayloadConfig;
|
||||
type Error = Error;
|
||||
type Future =
|
||||
Either<Box<Future<Item = String, Error = Error>>, FutureResult<String, Error>>;
|
||||
type Future = Either<
|
||||
Box<dyn Future<Item = String, Error = Error>>,
|
||||
FutureResult<String, Error>,
|
||||
>;
|
||||
|
||||
#[inline]
|
||||
fn from_request(req: &HttpRequest, payload: &mut dev::Payload) -> Self::Future {
|
||||
@ -291,7 +293,7 @@ pub struct HttpMessageBody {
|
||||
length: Option<usize>,
|
||||
stream: Option<dev::Decompress<dev::Payload>>,
|
||||
err: Option<PayloadError>,
|
||||
fut: Option<Box<Future<Item = Bytes, Error = PayloadError>>>,
|
||||
fut: Option<Box<dyn Future<Item = Bytes, Error = PayloadError>>>,
|
||||
}
|
||||
|
||||
impl HttpMessageBody {
|
||||
|
Reference in New Issue
Block a user