From fb456402b02ad3d0e6e76cbc3ca36f8141594044 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Thu, 8 Dec 2016 10:45:45 -1000
Subject: [PATCH] Replace an unidiomatic use of filter_map().

---
 components/net/http_loader.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 88d37877f54..a92a210881f 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -1248,11 +1248,9 @@ fn cors_preflight_fetch(request: Rc<Request>,
 
     // Step 3, 4
     let mut value = request.headers.borrow().iter()
-                                            .filter_map(|ref view| if is_simple_header(view) {
-                                                None
-                                            } else {
-                                                Some(UniCase(view.name().to_owned()))
-                                            }).collect::<Vec<UniCase<String>>>();
+                                            .filter(|view| !is_simple_header(view))
+                                            .map(|view| UniCase(view.name().to_owned()))
+                                            .collect::<Vec<UniCase<String>>>();
     value.sort();
 
     // Step 5