Auto merge of #10629 - frewsxcv:flatten, r=Ms2ger

Flatten a couple `net` implementations.

Working on some of the TLS related code in `net` and tried to clean up a couple implementations along the way.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10629)
<!-- Reviewable:end -->

components/net/file_loader.rs

@@ -72,11 +72,26 @@ pub fn factory(load_data: LoadData,
                cancel_listener: CancellationListener) {
     assert!(&*load_data.url.scheme == "file");
     spawn_named("file_loader".to_owned(), move || {
-        let file_path: Result<PathBuf, ()> = load_data.url.to_file_path();
+        let file_path = match load_data.url.to_file_path() {
-        match file_path {
+            Ok(file_path) => file_path,
-            Ok(file_path) => {
+            Err(_) => {
-                match File::open(&file_path) {
+                send_error(load_data.url, "Could not parse path".to_owned(), senders);
-                    Ok(ref mut reader) => {
+                return;
+            },
+        };
+        let mut file = File::open(&file_path);
+        let reader = match file {
+            Ok(ref mut reader) => reader,
+            Err(_) => {
+                // this should be one of the three errors listed in
+                // http://doc.rust-lang.org/std/fs/struct.OpenOptions.html#method.open
+                // but, we'll go for a "file not found!"
+                let url = Url::parse("about:not-found").unwrap();
+                let load_data_404 = LoadData::new(load_data.context, url, None);
+                about_loader::factory(load_data_404, senders, classifier, cancel_listener);
+                return;
+            }
+        };
         if cancel_listener.is_cancelled() {
             if let Ok(progress_chan) = get_progress_chan(load_data, file_path,
                                                          senders, classifier, &[]) {
@@ -106,21 +121,6 @@ pub fn factory(load_data: LoadData,
             Err(e) => {
                 send_error(load_data.url, e, senders);
             }
-                        };
-                    }
-                    Err(_) => {
-                        // this should be one of the three errors listed in
-                        // http://doc.rust-lang.org/std/fs/struct.OpenOptions.html#method.open
-                        // but, we'll go for a "file not found!"
-                        let url = Url::parse("about:not-found").unwrap();
-                        let load_data_404 = LoadData::new(load_data.context, url, None);
-                        about_loader::factory(load_data_404, senders, classifier, cancel_listener)
-                    }
-                }
-            }
-            Err(_) => {
-                send_error(load_data.url, "Could not parse path".to_owned(), senders);
-            }
         }
     });
 }

components/net/http_loader.rs

@@ -198,20 +198,20 @@ pub trait HttpResponse: Read {
         "HTTP/1.1".to_owned()
     }
     fn content_encoding(&self) -> Option<Encoding> {
-        self.headers().get::<ContentEncoding>().and_then(|h| {
+        let encodings = match self.headers().get::<ContentEncoding>() {
-            match *h {
+            Some(&ContentEncoding(ref encodings)) => encodings,
-                ContentEncoding(ref 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 }
+        } else {
+            None
         }
     }
-        })
-    }
 }