---

yaml
---
r: 23260
b: refs/heads/master
c: 6319c8f
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3038968f2895df915ca397864e96338edaa32e4b
+refs/heads/master: 6319c8fbc4840e02ee325c6c10bd487ef06518fb
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libsyntax/parse/parser.rs

@@ -40,17 +40,16 @@ import ast::{_mod, add, alt_check, alt_exhaustive, arg, arm, attribute,
              lit_str, lit_uint, local, m_const, m_imm, m_mutbl, mac_, mac_aq,
              mac_ellipsis, mac_invoc, mac_invoc_tt, mac_var, matcher,
              match_nonterminal, match_seq, match_tok, method, mode, mt, mul,
-             mutability, named_field, neg, noreturn, not, pat, pat_box, pat_enum,
-             pat_ident, pat_lit, pat_range, pat_rec, pat_struct, pat_tup,
-             pat_uniq, pat_wild, path, private, proto, proto_bare,
+             mutability, named_field, neg, noreturn, not, pat, pat_box,
+             pat_enum, pat_ident, pat_lit, pat_range, pat_rec, pat_struct,
+             pat_tup, pat_uniq, pat_wild, path, private, proto, proto_bare,
              proto_block, proto_box, proto_uniq, provided, public, pure_fn,
              purity, re_anon, re_named, region, rem, required, ret_style,
              return_val, self_ty, shl, shr, stmt, stmt_decl, stmt_expr,
              stmt_semi, struct_def, struct_field, struct_variant_kind,
-             subtract, sty_box,
-             sty_by_ref, sty_region, sty_static, sty_uniq, sty_value,
-             token_tree, trait_method, trait_ref, tt_delim, tt_seq, tt_tok,
-             tt_nonterminal, ty, ty_, ty_bot, ty_box, ty_field, ty_fn,
+             subtract, sty_box, sty_by_ref, sty_region, sty_static, sty_uniq,
+             sty_value, token_tree, trait_method, trait_ref, tt_delim, tt_seq,
+             tt_tok, tt_nonterminal, ty, ty_, ty_bot, ty_box, ty_field, ty_fn,
              ty_infer, ty_mac, ty_method, ty_nil, ty_param, ty_param_bound,
              ty_path, ty_ptr, ty_rec, ty_rptr, ty_tup, ty_u32, ty_uniq,
              ty_vec, ty_fixed_length, tuple_variant_kind, unchecked_blk, uniq,

trunk/src/rustc/metadata/encoder.rs

@@ -550,7 +550,8 @@ fn encode_info_for_class(ecx: @encode_ctxt, ebml_w: ebml::writer,
             named_field(nm, mt, vis) => {
                 let id = field.node.id;
                 vec::push(*index, {val: id, pos: ebml_w.writer.tell()});
-                vec::push(*global_index, {val: id, pos: ebml_w.writer.tell()});
+                vec::push(*global_index, {val: id,
+                                          pos: ebml_w.writer.tell()});
                 ebml_w.start_tag(tag_items_data_item);
                 debug!{"encode_info_for_class: doing %s %d", *nm, id};
                 encode_visibility(ebml_w, vis);

trunk/src/rustc/middle/typeck/check/method.rs

@@ -411,7 +411,7 @@ class lookup {
             // subtypability. Collect the matches.
             let matches;
             match mode {
-                subtyping_mode => 
+                subtyping_mode =>
                     matches = self.fcx.can_mk_subty(self.self_ty, impl_ty),
                 assignability_mode =>
                     matches = self.fcx.can_mk_assignty(self.self_expr,