diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2012-08-15 16:25:42 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2012-08-15 16:25:42 -0700 |
| commit | 6319c8fbc4840e02ee325c6c10bd487ef06518fb (patch) | |
| tree | 1ee1333a4b9311dec8e23e84c08b1b4ed3b02f87 | |
| parent | 3038968f2895df915ca397864e96338edaa32e4b (diff) | |
| download | rust-6319c8fbc4840e02ee325c6c10bd487ef06518fb.tar.gz rust-6319c8fbc4840e02ee325c6c10bd487ef06518fb.zip | |
rustc: Fix long lines and trailing whitespace
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 13 | ||||
| -rw-r--r-- | src/rustc/metadata/encoder.rs | 3 | ||||
| -rw-r--r-- | src/rustc/middle/typeck/check/method.rs | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 09930bc2553..0f1387069ca 100644 --- a/src/libsyntax/parse/parser.rs +++ b/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, diff --git a/src/rustc/metadata/encoder.rs b/src/rustc/metadata/encoder.rs index 968f051710b..f67aa9fed7b 100644 --- a/src/rustc/metadata/encoder.rs +++ b/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); diff --git a/src/rustc/middle/typeck/check/method.rs b/src/rustc/middle/typeck/check/method.rs index 6e45762eca6..34c6e306ccc 100644 --- a/src/rustc/middle/typeck/check/method.rs +++ b/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, |