From 7298b8f4bac7687824ef41f6e3f9f114aa070417 Mon Sep 17 00:00:00 2001 From: Marijn Haverbeke Date: Thu, 15 Sep 2011 09:48:39 +0200 Subject: [PATCH] Insert omitted semicolons for statements --- src/comp/metadata/encoder.rs | 2 +- src/comp/middle/resolve.rs | 2 +- src/comp/middle/trans.rs | 2 +- src/comp/middle/ty.rs | 13 ++++++------- src/comp/middle/typeck.rs | 7 +++---- src/comp/syntax/ext/simplext.rs | 2 +- src/comp/syntax/print/pprust.rs | 3 +-- src/lib/either.rs | 6 +++--- src/lib/str.rs | 2 +- src/test/bench/task-perf-word-count-generic.rs | 10 +++++----- src/test/bench/task-perf-word-count.rs | 8 +++----- src/test/run-fail/do-while-body-fails.rs | 2 +- src/test/run-pass/lambda-no-leak.rs | 2 +- src/test/run-pass/main-ivec.rs | 2 +- src/test/run-pass/wierd-exprs.rs | 2 +- 15 files changed, 30 insertions(+), 35 deletions(-) diff --git a/src/comp/metadata/encoder.rs b/src/comp/metadata/encoder.rs index 115e5063585..154f623eacb 100644 --- a/src/comp/metadata/encoder.rs +++ b/src/comp/metadata/encoder.rs @@ -521,7 +521,7 @@ fn synthesize_crate_attrs(ecx: @encode_ctxt, crate: @crate) -> [attribute] { } _ { [attr] } } - } + }; } if !found_link_attr { attrs += [synthesize_link_attr(ecx, [])]; } diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs index 4068c2e7c8e..4a1aa3ec8c6 100644 --- a/src/comp/middle/resolve.rs +++ b/src/comp/middle/resolve.rs @@ -1240,7 +1240,7 @@ fn mie_span(mie: mod_index_entry) -> span { fn check_item(e: @env, i: @ast::item, x: (), v: vt<()>) { fn typaram_names(tps: [ast::ty_param]) -> [ident] { let x: [ast::ident] = []; - for tp: ast::ty_param in tps { x += [tp.ident] } + for tp: ast::ty_param in tps { x += [tp.ident]; } ret x; } visit::visit_item(i, x, v); diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 5f89f17daf2..b6a1b9df198 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -3769,7 +3769,7 @@ fn get_landing_pad(bcx: @block_ctxt) -> BasicBlockRef { parent_none. { ret scope_bcx; } - } + }; } } fail; diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs index e03a3c80a00..84400b8c03a 100644 --- a/src/comp/middle/ty.rs +++ b/src/comp/middle/ty.rs @@ -991,12 +991,11 @@ fn type_kind(cx: ctxt, ty: t) -> ast::kind { // FIXME: the environment capture mode is not fully encoded // here yet, leading to weirdness around closure. ty_fn(proto, _, _, _, _) { - result = - alt proto { - ast::proto_block. { ast::kind_pinned } - ast::proto_closure. { ast::kind_shared } - _ { ast::kind_unique } - } + result = alt proto { + ast::proto_block. { ast::kind_pinned } + ast::proto_closure. { ast::kind_shared } + _ { ast::kind_unique } + }; } // Those with refcounts-to-inner raise pinned to shared, // lower unique to shared. Therefore just set result to shared. @@ -1007,7 +1006,7 @@ fn type_kind(cx: ctxt, ty: t) -> ast::kind { // otherwise pass through their pointee kind. ty_ptr(tm) | ty_vec(tm) { let k = type_kind(cx, tm.ty); - if k == ast::kind_pinned { k = ast::kind_shared } + if k == ast::kind_pinned { k = ast::kind_shared; } result = kind::lower_kind(result, k); } // Records lower to the lowest of their members. diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index 5608f57ddcc..d72a94b1e96 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -492,7 +492,7 @@ mod collect { fn ty_param_kinds(tps: [ast::ty_param]) -> [ast::kind] { let k: [ast::kind] = []; - for p: ast::ty_param in tps { k += [p.kind] } + for p: ast::ty_param in tps { k += [p.kind]; } ret k; } @@ -2539,8 +2539,7 @@ fn check_constraints(fcx: @fn_ctxt, cs: [@ast::constr], args: [ast::arg]) { for c: @ast::constr in cs { c_args = []; for a: @spanned in c.node.args { - c_args += - [ + c_args += [ // "base" should not occur in a fn type thing, as of // yet, b/c we don't allow constraints on the return type @@ -2582,7 +2581,7 @@ fn check_constraints(fcx: @fn_ctxt, cs: [@ast::constr], args: [ast::arg]) { carg_ident index out of bounds"); } } - }] + }]; } let p_op: ast::expr_ = ast::expr_path(c.node.path); let oper: @ast::expr = @{id: c.node.id, node: p_op, span: c.span}; diff --git a/src/comp/syntax/ext/simplext.rs b/src/comp/syntax/ext/simplext.rs index 5171f781578..516795ec928 100644 --- a/src/comp/syntax/ext/simplext.rs +++ b/src/comp/syntax/ext/simplext.rs @@ -750,7 +750,7 @@ fn add_new_extension(cx: ext_ctxt, sp: span, arg: @expr, _body: option::t, clauses: [@clause]) -> @expr { for c: @clause in clauses { alt use_selectors_to_bind(c.params, arg) { - some(bindings) { ret transcribe(cx, bindings, c.body) } + some(bindings) { ret transcribe(cx, bindings, c.body); } none. { cont; } } } diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs index 92ecceb7ad1..4b3228673ab 100644 --- a/src/comp/syntax/print/pprust.rs +++ b/src/comp/syntax/print/pprust.rs @@ -612,7 +612,6 @@ fn print_possibly_embedded_block(s: ps, blk: ast::blk, embedded: embed_type, } _ { false } } - true } _ { false } }; @@ -1424,7 +1423,7 @@ fn print_ty_fn(s: ps, proto: ast::proto, id: option::t, ibox(s, indent_unit); word_space(s, "->"); if cf == ast::noreturn { - word_nbsp(s, "!") + word_nbsp(s, "!"); } else { alt cf { ast::return_ref(mut) { word(s.s, mut ? "&!" : "&"); } diff --git a/src/lib/either.rs b/src/lib/either.rs index 0a23f3973be..143f0cabe92 100644 --- a/src/lib/either.rs +++ b/src/lib/either.rs @@ -13,7 +13,7 @@ fn either(eithers: [t]) -> [T] { let result: [T] = []; for elt: t in eithers { - alt elt { left(l) { result += [l] } _ {/* fallthrough */ } } + alt elt { left(l) { result += [l]; } _ {/* fallthrough */ } } } ret result; } @@ -21,7 +21,7 @@ fn lefts(eithers: [t]) -> [T] { fn rights(eithers: [t]) -> [U] { let result: [U] = []; for elt: t in eithers { - alt elt { right(r) { result += [r] } _ {/* fallthrough */ } } + alt elt { right(r) { result += [r]; } _ {/* fallthrough */ } } } ret result; } @@ -30,7 +30,7 @@ fn partition(eithers: [t]) -> {lefts: [T], rights: [U]} { let lefts: [T] = []; let rights: [U] = []; for elt: t in eithers { - alt elt { left(l) { lefts += [l] } right(r) { rights += [r] } } + alt elt { left(l) { lefts += [l]; } right(r) { rights += [r]; } } } ret {lefts: lefts, rights: rights}; } diff --git a/src/lib/str.rs b/src/lib/str.rs index ef10ca20ffc..aa58519d11a 100644 --- a/src/lib/str.rs +++ b/src/lib/str.rs @@ -71,7 +71,7 @@ fn is_whitespace(s: str) -> bool { let len = char_len(s); while i < len { if !char::is_whitespace(char_at(s, i)) { ret false; } - i += 1u + i += 1u; } ret true; } diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs index 0ed1f94e59f..436d6d1400d 100644 --- a/src/test/bench/task-perf-word-count-generic.rs +++ b/src/test/bench/task-perf-word-count-generic.rs @@ -40,10 +40,10 @@ fn map(filename: [u8], emit: map_reduce::putter<[u8], int>) { } } -fn reduce(word: [u8], get: map_reduce::getter) { +fn reduce(_word: [u8], get: map_reduce::getter) { let count = 0; - while true { alt get() { some(_) { count += 1; } none. { break } } } + while true { alt get() { some(_) { count += 1; } none. { break; } } } } mod map_reduce { @@ -93,7 +93,7 @@ mod map_reduce { ctrl: chan>, key: K2, val: V) { let c; alt treemap::find(im, key) { - some(_c) { c = _c } + some(_c) { c = _c; } none. { let p = port(); send(ctrl, find_reducer(key, chan(p))); @@ -107,7 +107,7 @@ mod map_reduce { map(input, bind emit(intermediates, ctrl, _, _)); - fn finish<~K, ~V>(k: K, v: chan>) { + fn finish<~K, ~V>(_k: K, v: chan>) { send(v, release); } treemap::traverse(intermediates, finish); @@ -190,7 +190,7 @@ mod map_reduce { } } - fn finish<~K, ~V>(k: K, v: chan>) { send(v, done); } + fn finish<~K, ~V>(_k: K, v: chan>) { send(v, done); } treemap::traverse(reducers, finish); for t in tasks { task::join(t); } diff --git a/src/test/bench/task-perf-word-count.rs b/src/test/bench/task-perf-word-count.rs index 81d97adc917..dd4602a423a 100644 --- a/src/test/bench/task-perf-word-count.rs +++ b/src/test/bench/task-perf-word-count.rs @@ -38,11 +38,10 @@ fn map(filename: str, emit: map_reduce::putter) { } } -fn reduce(word: str, get: map_reduce::getter) { +fn reduce(_word: str, get: map_reduce::getter) { let count = 0; - - while true { alt get() { some(_) { count += 1; } none. { break } } } + while true { alt get() { some(_) { count += 1; } none. { break; } } } } mod map_reduce { @@ -85,8 +84,7 @@ mod map_reduce { let c; alt im.find(key) { some(_c) { - - c = _c + c = _c; } none. { let p = port(); diff --git a/src/test/run-fail/do-while-body-fails.rs b/src/test/run-fail/do-while-body-fails.rs index 3ab257de397..08835ab9204 100644 --- a/src/test/run-fail/do-while-body-fails.rs +++ b/src/test/run-fail/do-while-body-fails.rs @@ -1,2 +1,2 @@ // error-pattern:quux -fn main() { let x: int = do { fail "quux" } while true; } +fn main() { let x: int = do { fail "quux"; } while true; } diff --git a/src/test/run-pass/lambda-no-leak.rs b/src/test/run-pass/lambda-no-leak.rs index 2c527e4953d..7807ec6c571 100644 --- a/src/test/run-pass/lambda-no-leak.rs +++ b/src/test/run-pass/lambda-no-leak.rs @@ -2,6 +2,6 @@ fn force(f: fn()) { f() } fn main() { let x = 7; - lambda () { log_err x; } + lambda () { log_err x; }; force(lambda () { log_err x; }); } diff --git a/src/test/run-pass/main-ivec.rs b/src/test/run-pass/main-ivec.rs index ec2403a9151..b279bc92a2b 100644 --- a/src/test/run-pass/main-ivec.rs +++ b/src/test/run-pass/main-ivec.rs @@ -1 +1 @@ -fn main(args: [str]) { for s in args { log s } } +fn main(args: [str]) { for s in args { log s; } } diff --git a/src/test/run-pass/wierd-exprs.rs b/src/test/run-pass/wierd-exprs.rs index 68add65630f..a24e34d6b6a 100644 --- a/src/test/run-pass/wierd-exprs.rs +++ b/src/test/run-pass/wierd-exprs.rs @@ -13,7 +13,7 @@ fn odd() { } fn what() { - fn the(x: @mutable bool) { ret while !*x { *x = true }; } + fn the(x: @mutable bool) { ret while !*x { *x = true; }; } let i = @mutable false; let dont = bind the(i); dont();