From f80ae3402a6f3f437b04e6c4b90f01ab4ab6d0e2 Mon Sep 17 00:00:00 2001
From: Sara Tang <sara_z_tang@yahoo.ca>
Date: Mon, 24 Aug 2015 21:32:16 -0400
Subject: [PATCH 1/2] Fixes for issue #7347

---
 components/net/mime_classifier.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/net/mime_classifier.rs b/components/net/mime_classifier.rs
index c4e94966548..52b462f3d10 100644
--- a/components/net/mime_classifier.rs
+++ b/components/net/mime_classifier.rs
@@ -277,22 +277,22 @@ impl MIMEChecker for Mp4Matcher {
 struct BinaryOrPlaintextClassifier;
 
 impl BinaryOrPlaintextClassifier {
-    fn classify_impl(&self, data: &[u8]) -> Option<(&'static str, &'static str)> {
+    fn classify_impl(&self, data: &[u8]) -> (&'static str, &'static str) {
         if (data.len() >= 2 &&
             ((data[0] == 0xFFu8 && data[1] == 0xFEu8) ||
             (data[0] == 0xFEu8 && data[1] == 0xFFu8))) ||
             (data.len() >= 3 && data[0] == 0xEFu8 && data[1] == 0xBBu8 && data[2] == 0xBFu8)
         {
-            Some(("text", "plain"))
+            ("text", "plain")
         }
         else if data.len() >= 1 && data.iter().any(|&x| x <= 0x08u8 ||
                                                         x == 0x0Bu8 ||
                                                         (x >= 0x0Eu8 && x <= 0x1Au8) ||
                                                         (x >= 0x1Cu8 && x <= 0x1Fu8)) {
-            Some(("application", "octet-stream"))
+            ("application", "octet-stream")
         }
         else {
-            Some(("text", "plain"))
+            ("text", "plain")
         }
     }
 }

From 8c39e968cd16980d4a50dd3ebe03ae009a96cd48 Mon Sep 17 00:00:00 2001
From: Sara Tang <sara_z_tang@yahoo.ca>
Date: Mon, 24 Aug 2015 23:11:31 -0400
Subject: [PATCH 2/2] Fixed mismatched type error

---
 components/net/mime_classifier.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/net/mime_classifier.rs b/components/net/mime_classifier.rs
index 52b462f3d10..ea71a26615d 100644
--- a/components/net/mime_classifier.rs
+++ b/components/net/mime_classifier.rs
@@ -298,7 +298,7 @@ impl BinaryOrPlaintextClassifier {
 }
 impl MIMEChecker for BinaryOrPlaintextClassifier {
     fn classify(&self, data: &[u8]) -> Option<(String, String)> {
-        return as_string_option(self.classify_impl(data));
+        return as_string_option(Some(self.classify_impl(data)));
     }
 }
 struct GroupedClassifier {