From aacb461bfb1008a13ec8ed8bd47b25de86837a50 Mon Sep 17 00:00:00 2001 From: ibraheemdev Date: Thu, 22 Apr 2021 12:15:37 -0400 Subject: [PATCH] static error handler middleware future --- src/middleware/condition.rs | 1 - src/middleware/err_handlers.rs | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/middleware/condition.rs b/src/middleware/condition.rs index fd0875014..5d748f885 100644 --- a/src/middleware/condition.rs +++ b/src/middleware/condition.rs @@ -6,7 +6,6 @@ use std::task::{Context, Poll}; use actix_service::{Service, Transform}; use actix_utils::future::Either; - use futures_core::ready; /// Middleware for conditionally enabling other middleware. diff --git a/src/middleware/err_handlers.rs b/src/middleware/err_handlers.rs index 88834f8ce..f99c89f90 100644 --- a/src/middleware/err_handlers.rs +++ b/src/middleware/err_handlers.rs @@ -9,7 +9,10 @@ use std::{ use actix_service::{Service, Transform}; use ahash::AHashMap; -use futures_core::{future::LocalBoxFuture, ready}; +use futures_util::{ + future::{ok, LocalBoxFuture, Ready}, + ready, +}; use crate::{ dev::{ServiceRequest, ServiceResponse}, @@ -97,11 +100,11 @@ where type Error = Error; type Transform = ErrorHandlersMiddleware; type InitError = (); - type Future = LocalBoxFuture<'static, Result>; + type Future = Ready>; fn new_transform(&self, service: S) -> Self::Future { let handlers = self.handlers.clone(); - Box::pin(async move { Ok(ErrorHandlersMiddleware { service, handlers }) }) + ok(ErrorHandlersMiddleware { service, handlers }) } }