From e03899379c05d5a5e4f6601e11b42a092fbf39ed Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Sat, 9 Jan 2021 02:01:23 +0800
Subject: [PATCH] fix actix-files Responder impl

---
 actix-files/src/named.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/actix-files/src/named.rs b/actix-files/src/named.rs
index a9b95bad1..9b39284c7 100644
--- a/actix-files/src/named.rs
+++ b/actix-files/src/named.rs
@@ -19,7 +19,6 @@ use actix_web::{
     Error, HttpMessage, HttpRequest, HttpResponse, Responder,
 };
 use bitflags::bitflags;
-use futures_util::future::{ready, Ready};
 use mime_guess::from_path;
 
 use crate::ChunkedReadFile;
@@ -495,10 +494,8 @@ fn none_match(etag: Option<&header::EntityTag>, req: &HttpRequest) -> bool {
 }
 
 impl Responder for NamedFile {
-    type Error = Error;
-    type Future = Ready<Result<HttpResponse, Error>>;
-
-    fn respond_to(self, req: &HttpRequest) -> Self::Future {
-        ready(self.into_response(req))
+    fn respond_to(self, req: &HttpRequest) -> HttpResponse {
+        self.into_response(req)
+            .unwrap_or_else(|e| HttpResponse::from_error(e))
     }
 }