From dce57a79c96a2c7d5946491df317d9da0d1e1869 Mon Sep 17 00:00:00 2001
From: Sabrina Jewson <sejewson@gmail.com>
Date: Mon, 30 May 2022 20:52:48 +0100
Subject: [PATCH] Implement `ResponseError` for `Infallible` (#2769)

---
 actix-web/CHANGES.md                  |  1 +
 actix-web/src/error/error.rs          |  6 ------
 actix-web/src/error/response_error.rs | 10 ++++++++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/actix-web/CHANGES.md b/actix-web/CHANGES.md
index 4a16073a6c0..cb82ef653c9 100644
--- a/actix-web/CHANGES.md
+++ b/actix-web/CHANGES.md
@@ -5,6 +5,7 @@
 - Add `ServiceRequest::extract()` to make it easier to use extractors when writing middlewares. [#2647]
 - Add `Route::wrap()` to allow individual routes to use middleware. [#2725]
 - Add `ServiceConfig::default_service()`. [#2338] [#2743]
+- Implement `ResponseError` for `std::convert::Infallible`
 
 ### Fixed
 - Clear connection-level data on `HttpRequest` drop. [#2742]
diff --git a/actix-web/src/error/error.rs b/actix-web/src/error/error.rs
index 3d3978dde1b..3a5a128f6cc 100644
--- a/actix-web/src/error/error.rs
+++ b/actix-web/src/error/error.rs
@@ -51,12 +51,6 @@ impl StdError for Error {
     }
 }
 
-impl From<std::convert::Infallible> for Error {
-    fn from(val: std::convert::Infallible) -> Self {
-        match val {}
-    }
-}
-
 /// `Error` for any error that implements `ResponseError`
 impl<T: ResponseError + 'static> From<T> for Error {
     fn from(err: T) -> Error {
diff --git a/actix-web/src/error/response_error.rs b/actix-web/src/error/response_error.rs
index 0b8a82ce896..7d2c061542d 100644
--- a/actix-web/src/error/response_error.rs
+++ b/actix-web/src/error/response_error.rs
@@ -1,6 +1,7 @@
 //! `ResponseError` trait and foreign impls.
 
 use std::{
+    convert::Infallible,
     error::Error as StdError,
     fmt,
     io::{self, Write as _},
@@ -54,6 +55,15 @@ downcast_dyn!(ResponseError);
 
 impl ResponseError for Box<dyn StdError + 'static> {}
 
+impl ResponseError for Infallible {
+    fn status_code(&self) -> StatusCode {
+        match *self {}
+    }
+    fn error_response(&self) -> HttpResponse<BoxBody> {
+        match *self {}
+    }
+}
+
 #[cfg(feature = "openssl")]
 impl ResponseError for actix_tls::accept::openssl::reexports::Error {}