auto merge of #5070 : youknowone/rust/struct-match2, r=nikomatsakis

It is reversed that type of arm pattern and type of search pattern
in error message.

src/test/compile-fail/issue-3680.rs

@@ -10,6 +10,6 @@
 
 fn main() {
     match None {
-            Err(_) => () //~ ERROR expected `core::result
+        Err(_) => () //~ ERROR mismatched types: expected `core::option::Option<<V1>>` but found `core::result::Result<<V2>,<V3>>`
     }
 }

src/test/compile-fail/match-struct.rs

@@ -1,11 +1,10 @@
-// error-pattern: mismatched types
 
 struct S { a: int }
 enum E { C(int) }
 
 fn main() {
     match S { a: 1 } {
-        C(_) => (),
+        C(_) => (), //~ ERROR mismatched types: expected `S` but found `E`
         _ => ()
     }
 }