From c33b3133c0021d9bf6aacf0cb31929b13da3a916 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 1 Sep 2021 09:16:55 +0100
Subject: [PATCH] make content encoding non exhaustive

---
 actix-http/CHANGES.md                           |  1 +
 actix-http/src/encoding/decoder.rs              |  3 +--
 .../src/header/shared/content_encoding.rs       | 17 ++++++-----------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index f4efef54a..decb0f154 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -18,6 +18,7 @@
 ### Fixed
 * Potential HTTP request smuggling vulnerabilities. [RUSTSEC-2021-0081](https://github.com/rustsec/advisory-db/pull/977)
 
+
 ## 3.0.0-beta.8 - 2021-06-26
 ### Changed
 * Change compression algorithm features flags. [#2250]
diff --git a/actix-http/src/encoding/decoder.rs b/actix-http/src/encoding/decoder.rs
index 81e97d916..c32983fc7 100644
--- a/actix-http/src/encoding/decoder.rs
+++ b/actix-http/src/encoding/decoder.rs
@@ -1,7 +1,6 @@
 //! Stream decoders.
 
 use std::{
-    convert::TryFrom,
     future::Future,
     io::{self, Write as _},
     pin::Pin,
@@ -81,7 +80,7 @@ where
         let encoding = headers
             .get(&CONTENT_ENCODING)
             .and_then(|val| val.to_str().ok())
-            .and_then(|x| ContentEncoding::try_from(x).ok())
+            .and_then(|x| x.parse().ok())
             .unwrap_or(ContentEncoding::Identity);
 
         Self::new(stream, encoding)
diff --git a/actix-http/src/header/shared/content_encoding.rs b/actix-http/src/header/shared/content_encoding.rs
index 375e8c2fa..1af109c06 100644
--- a/actix-http/src/header/shared/content_encoding.rs
+++ b/actix-http/src/header/shared/content_encoding.rs
@@ -1,5 +1,6 @@
-use std::{convert::TryFrom, error, fmt, str::FromStr};
+use std::{convert::TryFrom, str::FromStr};
 
+use derive_more::{Display, Error};
 use http::header::InvalidHeaderValue;
 
 use crate::{
@@ -11,19 +12,13 @@ use crate::{
 /// Error return when a content encoding is unknown.
 ///
 /// Example: 'compress'
-#[derive(Debug)]
+#[derive(Debug, Display, Error)]
+#[display(fmt = "unsupported content encoding")]
 pub struct ContentEncodingParseError;
 
-impl fmt::Display for ContentEncodingParseError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Unsupported content encoding")
-    }
-}
-
-impl error::Error for ContentEncodingParseError {}
-
 /// Represents a supported content encoding.
-#[derive(Copy, Clone, PartialEq, Debug)]
+#[derive(Debug, Clone, Copy, PartialEq)]
+#[non_exhaustive]
 pub enum ContentEncoding {
     /// Automatically select encoding based on encoding negotiation.
     Auto,