Skip to content

Commit b8cfd5c

Browse files
pcwaltonpcwalton
committed
librustc: Long lines. rs=rustbot
1 parent 01cd53b commit b8cfd5c

26 files changed

+99
-45
lines changed

‎src/librustc/driver/driver.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,8 @@ fn pretty_print_input(sess: Session, cfg: ast::crate_cfg, input: input,
342342
}
343343
pprust::node_block(s, ref blk) => {
344344
pp::space(s.s);
345-
pprust::synth_comment(s,
346-
~"block " + int::to_str((*blk).node.id, 10u));
345+
pprust::synth_comment(
346+
s, ~"block " + int::to_str((*blk).node.id, 10u));
347347
}
348348
pprust::node_expr(s, expr) => {
349349
pp::space(s.s);

‎src/librustc/metadata/encoder.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,8 +637,13 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
637637
encode_path(ecx, ebml_w, path, ast_map::path_name(item.ident));
638638
encode_region_param(ecx, ebml_w, item);
639639
}
640-
encode_enum_variant_info(ecx, ebml_w, item.id,
641-
(*enum_definition).variants, path, index, tps);
640+
encode_enum_variant_info(ecx,
641+
ebml_w,
642+
item.id,
643+
(*enum_definition).variants,
644+
path,
645+
index,
646+
tps);
642647
}
643648
item_class(struct_def, tps) => {
644649
/* First, encode the fields and methods

‎src/librustc/middle/check_alt.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,10 @@ impl ctor : cmp::Eq {
140140
match ((*self), (*other)) {
141141
(single, single) => true,
142142
(variant(did_self), variant(did_other)) => did_self == did_other,
143-
(val(ref cv_self), val(ref cv_other)) => (*cv_self) == (*cv_other),
144-
(range(ref cv0_self, ref cv1_self), range(ref cv0_other, ref cv1_other)) => {
143+
(val(ref cv_self), val(ref cv_other)) =>
144+
(*cv_self) == (*cv_other),
145+
(range(ref cv0_self, ref cv1_self),
146+
range(ref cv0_other, ref cv1_other)) => {
145147
(*cv0_self) == (*cv0_other) && (*cv1_self) == (*cv1_other)
146148
}
147149
(single, _) | (variant(_), _) | (val(_), _) | (range(*), _) => {

‎src/librustc/middle/lang_items.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ impl LanguageItemCollector {
156156
meta_name_value(ref key, literal) => {
157157
match literal.node {
158158
lit_str(value) => {
159-
self.match_and_collect_item(item_def_id, (*key), *value);
159+
self.match_and_collect_item(item_def_id,
160+
(*key),
161+
*value);
160162
}
161163
_ => {} // Skip.
162164
}

‎src/librustc/middle/resolve.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ impl Resolver {
15461546
in this module");
15471547
}
15481548

1549-
for (*path_list_idents).each |path_list_ident| {
1549+
for path_list_idents.each |path_list_ident| {
15501550
let ident = path_list_ident.node.name;
15511551
let id = path_list_ident.node.id;
15521552
module_.exported_names.insert(ident, id);
@@ -3646,7 +3646,7 @@ impl Resolver {
36463646
self.resolve_type(argument.ty, visitor);
36473647
}
36483648

3649-
self.resolve_type((*ty_m).decl.output, visitor);
3649+
self.resolve_type(ty_m.decl.output, visitor);
36503650
}
36513651
}
36523652
provided(m) => {
@@ -4894,7 +4894,7 @@ impl Resolver {
48944894

48954895
expr_fn(_, fn_decl, ref block, capture_clause) |
48964896
expr_fn_block(fn_decl, ref block, capture_clause) => {
4897-
self.resolve_function(FunctionRibKind(expr.id, (*block).node.id),
4897+
self.resolve_function(FunctionRibKind(expr.id, block.node.id),
48984898
Some(@fn_decl),
48994899
NoTypeParameters,
49004900
(*block),

‎src/librustc/middle/trans/base.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1832,7 +1832,13 @@ fn trans_enum_def(ccx: @crate_ctxt, enum_definition: ast::enum_def,
18321832
variant.node.name, variant.node.id);
18331833
}
18341834
ast::enum_variant_kind(ref enum_definition) => {
1835-
trans_enum_def(ccx, (*enum_definition), id, tps, degen, path, vi,
1835+
trans_enum_def(ccx,
1836+
*enum_definition,
1837+
id,
1838+
tps,
1839+
degen,
1840+
path,
1841+
vi,
18361842
i);
18371843
}
18381844
}

‎src/librustc/middle/trans/callee.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ fn trans_arg_expr(bcx: block,
622622
Some(_) => {
623623
match arg_expr.node {
624624
ast::expr_loop_body(
625-
blk @ @{node:ast::expr_fn_block(decl, ref body, cap), _}) =>
625+
blk@@{node:ast::expr_fn_block(decl, ref body, cap), _}) =>
626626
{
627627
let scratch_ty = expr_ty(bcx, blk);
628628
let scratch = alloc_ty(bcx, scratch_ty);

‎src/librustc/middle/trans/expr.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,8 @@ fn trans_rvalue_dps_unadjusted(bcx: block, expr: @ast::expr,
517517
controlflow::trans_block(bcx, (*blk), dest)
518518
};
519519
}
520-
ast::expr_rec(ref fields, base) | ast::expr_struct(_, ref fields, base) => {
520+
ast::expr_rec(ref fields, base) |
521+
ast::expr_struct(_, ref fields, base) => {
521522
return trans_rec_or_struct(bcx, (*fields), base, expr.id, dest);
522523
}
523524
ast::expr_tup(args) => {

‎src/librustc/middle/trans/foreign.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -667,8 +667,9 @@ fn trans_foreign_mod(ccx: @crate_ctxt,
667667
let llretptr = GEPi(bcx, llargbundle, [0u, n]);
668668
let llretloc = Load(bcx, llretptr);
669669
if (*x86_64).ret_ty.cast {
670-
let tmp_ptr = BitCast(bcx, llretloc,
671-
T_ptr((*x86_64).ret_ty.ty));
670+
let tmp_ptr = BitCast(bcx,
671+
llretloc,
672+
T_ptr((*x86_64).ret_ty.ty));
672673
Store(bcx, llretval, tmp_ptr);
673674
} else {
674675
Store(bcx, llretval, llretloc);

‎src/librustc/middle/trans/monomorphize.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,13 @@ fn monomorphic_fn(ccx: @crate_ctxt,
152152
});
153153

154154
let lldecl = match map_node {
155-
ast_map::node_item(i@@{node: ast::item_fn(decl, _, _, ref body), _}, _) => {
155+
ast_map::node_item(i@@{
156+
node: ast::item_fn(decl, _, _, ref body),
157+
_
158+
}, _) => {
156159
let d = mk_lldecl();
157160
set_inline_hint_if_appr(i.attrs, d);
158-
trans_fn(ccx, pt, decl, (*body), d, no_self, psubsts, fn_id.node, None);
161+
trans_fn(ccx, pt, decl, *body, d, no_self, psubsts, fn_id.node, None);
159162
d
160163
}
161164
ast_map::node_item(*) => {

‎src/librustc/middle/trans/reachable.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ fn traverse_def_id(cx: ctx, did: def_id) {
6868
ast_map::node_foreign_item(item, _, _) => {
6969
cx.rmap.insert(item.id, ());
7070
}
71-
ast_map::node_variant(ref v, _, _) => { cx.rmap.insert((*v).node.id, ()); }
71+
ast_map::node_variant(ref v, _, _) => {
72+
cx.rmap.insert((*v).node.id, ());
73+
}
7274
_ => ()
7375
}
7476
}

‎src/librustc/middle/trans/type_of.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ fn type_of(cx: @crate_ctxt, t: ty::t) -> TypeRef {
119119
// avoids creating more than one copy of the enum when one
120120
// of the enum's variants refers to the enum itself.
121121

122-
common::T_named_struct(llvm_type_name(cx, an_enum, did, (*substs).tps))
122+
common::T_named_struct(llvm_type_name(cx, an_enum, did, substs.tps))
123123
}
124124
ty::ty_estr(ty::vstore_box) => {
125125
T_box_ptr(T_box(cx, T_vec(cx, T_i8())))
@@ -184,7 +184,7 @@ fn type_of(cx: @crate_ctxt, t: ty::t) -> TypeRef {
184184
// in *after* placing it into the type cache. This prevents
185185
// infinite recursion with recursive class types.
186186

187-
common::T_named_struct(llvm_type_name(cx, a_class, did, (*substs).tps))
187+
common::T_named_struct(llvm_type_name(cx, a_class, did, substs.tps))
188188
}
189189
ty::ty_self => cx.tcx.sess.unimpl(~"type_of: ty_self"),
190190
ty::ty_infer(*) => cx.tcx.sess.bug(~"type_of with ty_infer"),

‎src/librustc/middle/ty.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3535,7 +3535,10 @@ fn store_trait_methods(cx: ctxt, id: ast::node_id, ms: @~[method]) {
35353535
fn provided_trait_methods(cx: ctxt, id: ast::def_id) -> ~[ast::ident] {
35363536
if is_local(id) {
35373537
match cx.items.find(id.node) {
3538-
Some(ast_map::node_item(@{node: item_trait(_, _, ref ms),_}, _)) =>
3538+
Some(ast_map::node_item(@{
3539+
node: item_trait(_, _, ref ms),
3540+
_
3541+
}, _)) =>
35393542
match ast_util::split_trait_methods((*ms)) {
35403543
(_, p) => p.map(|method| method.ident)
35413544
},
@@ -3603,7 +3606,9 @@ fn impl_traits(cx: ctxt, id: ast::def_id, vstore: vstore) -> ~[t] {
36033606
fn vstoreify(cx: ctxt, ty: t, vstore: vstore) -> t {
36043607
match ty::get(ty).sty {
36053608
ty::ty_trait(_, _, trait_vstore) if vstore == trait_vstore => ty,
3606-
ty::ty_trait(did, ref substs, _) => mk_trait(cx, did, (*substs), vstore),
3609+
ty::ty_trait(did, ref substs, _) => {
3610+
mk_trait(cx, did, (*substs), vstore)
3611+
}
36073612
_ => cx.sess.bug(~"impl_traits: not a trait")
36083613
}
36093614
}
@@ -3825,8 +3830,10 @@ fn enum_variants(cx: ctxt, id: ast::def_id) -> @~[VariantInfo] {
38253830
expr, since check_enum_variants also updates the enum_var_cache
38263831
*/
38273832
match cx.items.get(id.node) {
3828-
ast_map::node_item(@{node: ast::item_enum(ref enum_definition, _), _},
3829-
_) => {
3833+
ast_map::node_item(@{
3834+
node: ast::item_enum(ref enum_definition, _),
3835+
_
3836+
}, _) => {
38303837
let variants = (*enum_definition).variants;
38313838
let mut disr_val = -1;
38323839
@vec::map(variants, |variant| {

‎src/librustc/middle/typeck/check/method.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -883,9 +883,9 @@ impl LookupContext {
883883
let candidates_same = match (&candidate_a.origin,
884884
&candidate_b.origin) {
885885
(&method_param(ref p1), &method_param(ref p2)) => {
886-
let same_trait = (*p1).trait_id == (*p2).trait_id;
887-
let same_method = (*p1).method_num == (*p2).method_num;
888-
let same_param = (*p1).param_num == (*p2).param_num;
886+
let same_trait = p1.trait_id == p2.trait_id;
887+
let same_method = p1.method_num == p2.method_num;
888+
let same_param = p1.param_num == p2.param_num;
889889
// The bound number may be different because
890890
// multiple bounds may lead to the same trait
891891
// impl

‎src/librustc/middle/typeck/check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3048,7 +3048,7 @@ fn check_intrinsic_type(ccx: @crate_ctxt, it: @ast::foreign_item) {
30483048
~"log10f32" => {
30493049
(0u, ~[arg(ast::by_copy, ty::mk_f32(tcx))],
30503050
ty::mk_f32(tcx))
3051-
}
3051+
}
30523052
~"log10f64" => {
30533053
(0u, ~[arg(ast::by_copy, ty::mk_f64(tcx))],
30543054
ty::mk_f64(tcx))

‎src/librustc/middle/typeck/collect.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,11 @@ fn get_enum_variant_types(ccx: @crate_ctxt,
165165
ccx, rp, struct_def, ty_params, tpt, variant.node.id);
166166
}
167167
ast::enum_variant_kind(ref enum_definition) => {
168-
get_enum_variant_types(ccx, enum_ty, (*enum_definition).variants,
169-
ty_params, rp);
168+
get_enum_variant_types(ccx,
169+
enum_ty,
170+
enum_definition.variants,
171+
ty_params,
172+
rp);
170173
result_ty = None;
171174
}
172175
};
@@ -232,11 +235,16 @@ fn ensure_trait_methods(ccx: @crate_ctxt, id: ast::node_id, trait_ty: ty::t) {
232235
let tcx = ccx.tcx;
233236
let region_paramd = tcx.region_paramd_items.find(id);
234237
match tcx.items.get(id) {
235-
ast_map::node_item(@{node: ast::item_trait(params, _, ref ms), _}, _) => {
238+
ast_map::node_item(@{
239+
node: ast::item_trait(params, _, ref ms),
240+
_
241+
}, _) => {
236242
store_methods::<ast::trait_method>(ccx, id, (*ms), |m| {
237243
let def_id;
238244
match *m {
239-
ast::required(ref ty_method) => def_id = local_def((*ty_method).id),
245+
ast::required(ref ty_method) => {
246+
def_id = local_def((*ty_method).id)
247+
}
240248
ast::provided(method) => def_id = local_def(method.id)
241249
}
242250

‎src/libsyntax/attr.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,9 @@ fn eq(a: @ast::meta_item, b: @ast::meta_item) -> bool {
211211
_ => false
212212
},
213213
ast::meta_name_value(ref na, va) => match b.node {
214-
ast::meta_name_value(ref nb, vb) => (*na) == (*nb) && va.node == vb.node,
214+
ast::meta_name_value(ref nb, vb) => {
215+
(*na) == (*nb) && va.node == vb.node
216+
}
215217
_ => false
216218
},
217219
ast::meta_list(*) => {

‎src/libsyntax/codemap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ pub impl CodeMap {
311311
FssExternal(ref eloc) => {
312312
{filename: /* FIXME (#2543) */ copy (*eloc).filename,
313313
line: (*eloc).line + loc.line - 1u,
314-
col: if loc.line == 1u {(*eloc).col + loc.col} else {loc.col},
314+
col: if loc.line == 1 {eloc.col + loc.col} else {loc.col},
315315
file: None}
316316
}
317317
}

‎src/libsyntax/ext/expand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ fn expand_stmt(exts: HashMap<~str, syntax_extension>, cx: ext_ctxt,
283283
-> (stmt_, span)
284284
{
285285
let (mac, pth, tts, semi) = biased_match! (
286-
(s) ~ (stmt_mac(ref mac, semi)) else return orig(s, sp, fld);
286+
(s) ~ (stmt_mac(ref mac, semi)) else return orig(s, sp, fld);
287287
((*mac).node) ~ (mac_invoc_tt(pth, ref tts)) else {
288288
cx.span_bug((*mac).span, ~"naked syntactic bit")
289289
};

‎src/libsyntax/ext/simplext.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,9 @@ fn transcribe_block(cx: ext_ctxt, b: bindings, idx_path: @mut ~[uint],
422422
return match block_to_ident(blk) {
423423
Some(id) => {
424424
match follow_for_trans(cx, b.find(id), idx_path) {
425-
Some(match_block(ref new_blk)) => ((*new_blk).node, (*new_blk).span),
425+
Some(match_block(ref new_blk)) => {
426+
((*new_blk).node, (*new_blk).span)
427+
}
426428

427429
// possibly allow promotion of ident/path/expr to blocks?
428430
Some(ref m) => match_error(cx, (*m), ~"a block"),

‎src/libsyntax/ext/tt/macro_parser.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ fn nameize(p_s: parse_sess, ms: ~[matcher], res: ~[@named_match])
185185
match m {
186186
{node: match_tok(_), span: _} => (),
187187
{node: match_seq(ref more_ms, _, _, _, _), span: _} => {
188-
for (*more_ms).each() |next_m| { n_rec(p_s, *next_m, res, ret_val) };
188+
for (*more_ms).each() |next_m| {
189+
n_rec(p_s, *next_m, res, ret_val)
190+
};
189191
}
190192
{node: match_nonterminal(bind_name, _, idx), span: sp} => {
191193
if ret_val.contains_key(bind_name) {

‎src/libsyntax/ext/tt/macro_rules.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ fn add_new_extension(cx: ext_ctxt, sp: span, name: ident,
9494
@matched_nonterminal(nt_tt(@ref tt)) => {
9595
match (*tt) {
9696
// cut off delimiters; don't parse 'em
97-
tt_delim(ref tts) => (*tts).slice(1u,(*tts).len()-1u),
97+
tt_delim(ref tts) => {
98+
(*tts).slice(1u,(*tts).len()-1u)
99+
}
98100
_ => cx.span_fatal(
99101
sp, ~"macro rhs must be delimited")
100102
}

‎src/libsyntax/ext/tt/transcribe.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ fn tt_next_token(&&r: tt_reader) -> {tok: Token, sp: span} {
199199
~"attempted to repeat an expression containing no syntax \
200200
variables matched as repeating at this depth");
201201
}
202-
lis_contradiction(ref msg) => { /* FIXME #2887 blame macro invoker
203-
instead*/
202+
lis_contradiction(ref msg) => {
203+
/* FIXME #2887 blame macro invoker instead*/
204204
r.sp_diag.span_fatal(sp, (*msg));
205205
}
206206
lis_constraint(len, _) => {
@@ -217,8 +217,13 @@ fn tt_next_token(&&r: tt_reader) -> {tok: Token, sp: span} {
217217
} else {
218218
r.repeat_len.push(len);
219219
r.repeat_idx.push(0u);
220-
r.cur = @{readme: (*tts), mut idx: 0u, dotdotdoted: true,
221-
sep: (*sep), up: tt_frame_up(option::Some(r.cur))};
220+
r.cur = @{
221+
readme: (*tts),
222+
mut idx: 0u,
223+
dotdotdoted: true,
224+
sep: (*sep),
225+
up: tt_frame_up(option::Some(r.cur))
226+
};
222227
}
223228
}
224229
}

‎src/libsyntax/fold.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,8 @@ fn noop_fold_ty(t: ty_, fld: ast_fold) -> ty_ {
519519
ty_vec(mt) => ty_vec(fold_mt(mt, fld)),
520520
ty_ptr(mt) => ty_ptr(fold_mt(mt, fld)),
521521
ty_rptr(region, mt) => ty_rptr(region, fold_mt(mt, fld)),
522-
ty_rec(ref fields) => ty_rec(vec::map((*fields), |f| fold_field(*f, fld))),
522+
ty_rec(ref fields) =>
523+
ty_rec(vec::map((*fields), |f| fold_field(*f, fld))),
523524
ty_fn(f) =>
524525
ty_fn(@TyFn {
525526
proto: f.proto,

‎src/libsyntax/parse/parser.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ macro_rules! maybe_whole (
155155
_ => ()
156156
}) ;
157157
(pair_empty $p:expr, $constructor:ident) => ( match copy $p.token {
158-
INTERPOLATED(token::$constructor(ref x)) => { $p.bump(); return (~[], (*x)); }
158+
INTERPOLATED(token::$constructor(ref x)) => {
159+
$p.bump(); return (~[], (*x));
160+
}
159161
_ => ()
160162
})
161163

‎src/libsyntax/print/pprust.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,8 @@ fn print_struct(s: ps, struct_def: @ast::struct_def, tps: ~[ast::ty_param],
744744
/// expression arguments as expressions). It can be done! I think.
745745
fn print_tt(s: ps, tt: ast::token_tree) {
746746
match tt {
747-
ast::tt_delim(ref tts) => for (*tts).each() |tt_elt| { print_tt(s, *tt_elt); },
747+
ast::tt_delim(ref tts) =>
748+
for (*tts).each() |tt_elt| { print_tt(s, *tt_elt); },
748749
ast::tt_tok(_, ref tk) => {
749750
match (*tk) {
750751
parse::token::IDENT(*) => { // don't let idents run together

0 commit comments

Comments
 (0)