---

yaml
---
r: 58803
b: refs/heads/incoming
c: 32b3d3e
h: refs/heads/master
i:
  58801: 3111be3
  58799: 70403c7
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 13df2ea69c332d7a20c7ab394020430a09dad507
+refs/heads/incoming: 32b3d3e9ebd8dbc1073445b3be9676da85b6410c
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/typeck/check/_match.rs

@@ -120,12 +120,12 @@ pub fn check_pat_variant(pcx: &pat_ctxt, pat: @ast::pat, path: @ast::Path,
                     let enum_tpt = ty::lookup_item_type(tcx, enm);
                     instantiate_path(pcx.fcx, path, enum_tpt, pat.span, pat.id,
                                      pcx.block_region);
-                    
+
                     // check that the type of the value being matched is a subtype
                     // of the type of the pattern:
                     let pat_ty = fcx.node_ty(pat.id);
                     demand::subtype(fcx, pat.span, expected, pat_ty);
-                    
+
                     // Get the expected types of the arguments.
                     arg_types = {
                         let vinfo =
@@ -143,18 +143,18 @@ pub fn check_pat_variant(pcx: &pat_ctxt, pat: @ast::pat, path: @ast::Path,
                             }
                         })
                     };
-                    
+
                     kind_name = "variant";
                 }
                 None => {
                     let resolved_expected =
                         fcx.infcx().ty_to_str(fcx.infcx().resolve_type_vars_if_possible(expected));
                     fcx.infcx().type_error_message_str(pat.span,
                                                        |actual| {
-                                                           fmt!("mismatched types: expected `%s` but found %s",
-                                                                resolved_expected, actual)},
-                                                       ~"a structure pattern",
-                                                       None);
+                        fmt!("mismatched types: expected `%s` but found %s",
+                             resolved_expected, actual)},
+                             ~"a structure pattern",
+                             None);
                     fcx.write_error(pat.id);
                     kind_name = "[error]";
                     arg_types = (copy subpats).get_or_default(~[]).map(|_|