Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a

1 files changed, 4 insertions, 4 deletions

diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs
index 812b1d5d3d0..86f8a75e98c 100644
--- a/components/net/resource_task.rs
+++ b/components/net/resource_task.rs
@@ -90,9 +90,9 @@ impl Metadata {
     pub fn set_content_type(&mut self, content_type: &Option<MediaType>) {
         match *content_type {
             None => (),
-            Some(MediaType { type_:      ref type_,
-                             subtype:    ref subtype,
-                             parameters: ref parameters }) => {
+            Some(MediaType { ref type_,
+                             ref subtype,
+                             ref parameters }) => {
                 self.content_type = Some((type_.clone(), subtype.clone()));
                 for &(ref k, ref v) in parameters.iter() {
                     if "charset" == k.as_slice() {
@@ -266,7 +266,7 @@ fn test_bad_scheme() {
     let response = start.recv();
     match response.progress_port.recv() {
       Done(result) => { assert!(result.is_err()) }
-      _ => fail!("bleh")
+      _ => panic!("bleh")
     }
     resource_task.send(Exit);
 }