Update hyper to 0.12

1 files changed, 16 insertions, 17 deletions

diff --git a/components/script/body.rs b/components/script/body.rs
index 9709043912b..cfc167d25b4 100644
--- a/components/script/body.rs
+++ b/components/script/body.rs
@@ -22,7 +22,7 @@ use js::jsval::UndefinedValue;
 use js::rust::wrappers::JS_GetPendingException;
 use js::rust::wrappers::JS_ParseJSON;
 use js::typedarray::{ArrayBuffer, CreateWith};
-use mime::{Mime, TopLevel, SubLevel};
+use mime::{self, Mime};
 use std::cell::Ref;
 use std::ptr;
 use std::rc::Rc;
@@ -175,23 +175,22 @@ fn run_form_data_algorithm(
     } else {
         ""
     };
-    let mime: Mime = mime_str
-        .parse()
-        .map_err(|_| Error::Type("Inappropriate MIME-type for Body".to_string()))?;
-    match mime {
-        // TODO
-        // ... Parser for Mime(TopLevel::Multipart, SubLevel::FormData, _)
-        // ... is not fully determined yet.
-        Mime(TopLevel::Application, SubLevel::WwwFormUrlEncoded, _) => {
-            let entries = form_urlencoded::parse(&bytes);
-            let formdata = FormData::new(None, root);
-            for (k, e) in entries {
-                formdata.Append(USVString(k.into_owned()), USVString(e.into_owned()));
-            }
-            return Ok(FetchedData::FormData(formdata));
-        },
-        _ => return Err(Error::Type("Inappropriate MIME-type for Body".to_string())),
+    let mime: Mime = mime_str.parse().map_err(
+        |_| Error::Type("Inappropriate MIME-type for Body".to_string()))?;
+
+    // TODO
+    // ... Parser for Mime(TopLevel::Multipart, SubLevel::FormData, _)
+    // ... is not fully determined yet.
+    if mime.type_() == mime::APPLICATION && mime.subtype() == mime::WWW_FORM_URLENCODED {
+        let entries = form_urlencoded::parse(&bytes);
+        let formdata = FormData::new(None, root);
+        for (k, e) in entries {
+            formdata.Append(USVString(k.into_owned()), USVString(e.into_owned()));
+        }
+        return Ok(FetchedData::FormData(formdata));
     }
+
+    Err(Error::Type("Inappropriate MIME-type for Body".to_string()))
 }
 
 #[allow(unsafe_code)]