From 12dfe6ff28d937a85e9652bb74258bf9e97ac869 Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Fri, 15 Apr 2016 09:12:51 -0400
Subject: [PATCH] Flatten implementation of `net::http_response::HttpResponse`.

---
 components/net/http_loader.rs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index f27801af52c..e7f43788783 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -198,19 +198,19 @@ pub trait HttpResponse: Read {
         "HTTP/1.1".to_owned()
     }
     fn content_encoding(&self) -> Option<Encoding> {
-        self.headers().get::<ContentEncoding>().and_then(|h| {
-            match *h {
-                ContentEncoding(ref encodings) => {
-                    if encodings.contains(&Encoding::Gzip) {
-                        Some(Encoding::Gzip)
-                    } else if encodings.contains(&Encoding::Deflate) {
-                        Some(Encoding::Deflate)
-                    } else if encodings.contains(&Encoding::EncodingExt("br".to_owned())) {
-                        Some(Encoding::EncodingExt("br".to_owned()))
-                    } else { None }
-                }
-            }
-        })
+        let encodings = match self.headers().get::<ContentEncoding>() {
+            Some(&ContentEncoding(ref encodings)) => encodings,
+            None => return None,
+        };
+        if encodings.contains(&Encoding::Gzip) {
+            Some(Encoding::Gzip)
+        } else if encodings.contains(&Encoding::Deflate) {
+            Some(Encoding::Deflate)
+        } else if encodings.contains(&Encoding::EncodingExt("br".to_owned())) {
+            Some(Encoding::EncodingExt("br".to_owned()))
+        } else {
+            None
+        }
     }
 }