The wonky for...in... whitespace was bothering me. Sorry!

10 files changed, 80 insertions, 80 deletions

diff --git a/src/comp/syntax/ast.rs b/src/comp/syntax/ast.rs
index 82ca1772c73..ce20360e9ec 100644
--- a/src/comp/syntax/ast.rs
+++ b/src/comp/syntax/ast.rs
@@ -618,11 +618,11 @@ tag native_item_ {
 
 fn is_exported(i: ident, m: _mod) -> bool {
     let nonlocal = true;
-    for it: @ast::item  in m.items {
+    for it: @ast::item in m.items {
         if it.ident == i { nonlocal = false; }
         alt it.node {
           item_tag(variants, _) {
-            for v: variant  in variants {
+            for v: variant in variants {
                 if v.node.name == i { nonlocal = false; }
             }
           }
@@ -631,7 +631,7 @@ fn is_exported(i: ident, m: _mod) -> bool {
         if !nonlocal { break; }
     }
     let count = 0u;
-    for vi: @ast::view_item  in m.view_items {
+    for vi: @ast::view_item in m.view_items {
         alt vi.node {
           ast::view_item_export(id, _) {
             if str::eq(i, id) {
diff --git a/src/comp/syntax/codemap.rs b/src/comp/syntax/codemap.rs
index e3c061a0bb8..7e41865afa4 100644
--- a/src/comp/syntax/codemap.rs
+++ b/src/comp/syntax/codemap.rs
@@ -142,7 +142,7 @@ fn maybe_highlight_lines(sp: &option::t[span], cm: &codemap,
             elided = true;
         }
         // Print the offending lines
-        for line: uint  in display_lines {
+        for line: uint in display_lines {
             io::stdout().write_str(#fmt("%s:%u ", fm.name, line + 1u));
             let s = get_line(fm, line as int, file);
             if !str::ends_with(s, "\n") { s += "\n"; }
@@ -203,7 +203,7 @@ fn span_to_lines(sp: span, cm: codemap::codemap) -> @file_lines {
     let lo = lookup_char_pos(cm, sp.lo);
     let hi = lookup_char_pos(cm, sp.hi);
     let lines = ~[];
-    for each i: uint  in uint::range(lo.line - 1u, hi.line as uint) {
+    for each i: uint in uint::range(lo.line - 1u, hi.line as uint) {
         lines += ~[i];
     }
     ret @{name: lo.filename, lines: lines};
@@ -227,7 +227,7 @@ fn get_line(fm: filemap, line: int, file: &str) -> str {
 }
 
 fn get_filemap(cm: codemap, filename: str) -> filemap {
-    for fm: filemap  in cm.files { if fm.name == filename { ret fm; } }
+    for fm: filemap in cm.files { if fm.name == filename { ret fm; } }
     //XXjdm the following triggers a mismatched type bug
     //      (or expected function, found _|_)
     fail; // ("asking for " + filename + " which we don't know about");
diff --git a/src/comp/syntax/ext/fmt.rs b/src/comp/syntax/ext/fmt.rs
index 27fcece7fb5..cc3d4fef52e 100644
--- a/src/comp/syntax/ext/fmt.rs
+++ b/src/comp/syntax/ext/fmt.rs
@@ -86,7 +86,7 @@ fn pieces_to_expr(cx: &ext_ctxt, sp: span, pieces: &[piece],
                      fields: &[{ident: ast::ident, ex: @ast::expr}]) ->
        @ast::expr {
         let astfields: [ast::field] = ~[];
-        for field: {ident: ast::ident, ex: @ast::expr}  in fields {
+        for field: {ident: ast::ident, ex: @ast::expr} in fields {
             let ident = field.ident;
             let val = field.ex;
             let astfield =
@@ -115,7 +115,7 @@ fn pieces_to_expr(cx: &ext_ctxt, sp: span, pieces: &[piece],
         fn make_flags(cx: &ext_ctxt, sp: span, flags: &[flag]) ->
            @ast::expr {
             let flagexprs: [@ast::expr] = ~[];
-            for f: flag  in flags {
+            for f: flag in flags {
                 let fstr;
                 alt f {
                   flag_left_justify. { fstr = "flag_left_justify"; }
@@ -205,7 +205,7 @@ fn pieces_to_expr(cx: &ext_ctxt, sp: span, pieces: &[piece],
           option::none. { }
           _ { cx.span_unimpl(sp, unsupported); }
         }
-        for f: flag  in cnv.flags {
+        for f: flag in cnv.flags {
             alt f {
               flag_left_justify. { }
               flag_sign_always. {
@@ -259,7 +259,7 @@ fn pieces_to_expr(cx: &ext_ctxt, sp: span, pieces: &[piece],
           some(p) { log "param: " + std::int::to_str(p, 10u); }
           _ { log "param: none"; }
         }
-        for f: flag  in c.flags {
+        for f: flag in c.flags {
             alt f {
               flag_left_justify. { log "flag: left justify"; }
               flag_left_zero_pad. { log "flag: left zero pad"; }
@@ -308,7 +308,7 @@ fn pieces_to_expr(cx: &ext_ctxt, sp: span, pieces: &[piece],
     let n = 0u;
     let tmp_expr = make_new_str(cx, sp, "");
     let nargs = ivec::len[@ast::expr](args);
-    for pc: piece  in pieces {
+    for pc: piece in pieces {
         alt pc {
           piece_string(s) {
             let s_expr = make_new_str(cx, fmt_sp, s);
diff --git a/src/comp/syntax/ext/simplext.rs b/src/comp/syntax/ext/simplext.rs
index b57812cb1d2..543cd8b4644 100644
--- a/src/comp/syntax/ext/simplext.rs
+++ b/src/comp/syntax/ext/simplext.rs
@@ -95,7 +95,7 @@ fn elts_to_ell(cx: &ext_ctxt, elts: &[@expr])
     -> {pre: [@expr], rep: option::t[@expr], post: [@expr]} {
     let idx: uint = 0u;
     let res = none;
-    for elt: @expr  in elts {
+    for elt: @expr in elts {
         alt elt.node {
           expr_mac(m) {
             alt m.node {
@@ -124,7 +124,7 @@ fn elts_to_ell(cx: &ext_ctxt, elts: &[@expr])
 fn option_flatten_map[T, U](f: &fn(&T) -> option::t[U] , v: &[T]) ->
    option::t[[U]] {
     let res = ~[];
-    for elem: T  in v {
+    for elem: T in v {
         alt f(elem) { none. { ret none; } some(fv) { res += ~[fv]; } }
     }
     ret some(res);
@@ -185,11 +185,11 @@ selectors. */
 fn use_selectors_to_bind(b: &binders, e: @expr) -> option::t[bindings] {
     let res = new_str_hash[arb_depth[matchable]]();
     //need to do this first, to check vec lengths.
-    for sel: selector  in b.literal_ast_matchers {
+    for sel: selector in b.literal_ast_matchers {
         alt sel(match_expr(e)) { none. { ret none; } _ { } }
     }
     let never_mind: bool = false;
-    for each pair: @{key: ident, val: selector}  in b.real_binders.items() {
+    for each pair: @{key: ident, val: selector} in b.real_binders.items() {
         alt pair.val(match_expr(e)) {
           none. { never_mind = true; }
           some(mtc) { res.insert(pair.key, mtc); }
@@ -233,7 +233,7 @@ fn transcribe(cx: &ext_ctxt, b: &bindings, body: @expr) -> @expr {
 fn follow(m: &arb_depth[matchable], idx_path: @mutable [uint]) ->
    arb_depth[matchable] {
     let res: arb_depth[matchable] = m;
-    for idx: uint  in *idx_path {
+    for idx: uint in *idx_path {
         alt res {
           leaf(_) { ret res;/* end of the line */ }
           seq(new_ms, _) { res = new_ms.(idx); }
@@ -276,7 +276,7 @@ iter free_vars(b: &bindings, e: @expr) -> ident {
     let f = make_fold(f_pre);
     f.fold_expr(e); // ignore result
     dummy_out(f);
-    for each id: ident  in idents.keys() { put id; }
+    for each id: ident in idents.keys() { put id; }
 }
 
 
@@ -293,7 +293,7 @@ fn transcribe_exprs(cx: &ext_ctxt, b: &bindings, idx_path: @mutable [uint],
             let repeat: option::t[{rep_count: uint, name: ident}] = none;
             /* we need to walk over all the free vars in lockstep, except for
             the leaves, which are just duplicated */
-            for each fv: ident  in free_vars(b, repeat_me) {
+            for each fv: ident in free_vars(b, repeat_me) {
                 let cur_pos = follow(b.get(fv), idx_path);
                 alt cur_pos {
                   leaf(_) { }
@@ -686,7 +686,7 @@ fn add_new_extension(cx: &ext_ctxt, sp: span, arg: @expr,
 
     let macro_name: option::t[str] = none;
     let clauses: [@clause] = ~[];
-    for arg: @expr  in args {
+    for arg: @expr in args {
         alt arg.node {
           expr_vec(elts, mut, seq_kind) {
             if ivec::len(elts) != 2u {
diff --git a/src/comp/syntax/fold.rs b/src/comp/syntax/fold.rs
index 806d72499aa..944915384ee 100644
--- a/src/comp/syntax/fold.rs
+++ b/src/comp/syntax/fold.rs
@@ -283,7 +283,7 @@ fn noop_fold_pat(p: &pat_, fld: ast_fold) -> pat_ {
           }
           pat_rec(fields, etc) {
             let fs = ~[];
-            for f: ast::field_pat  in fields {
+            for f: ast::field_pat in fields {
                 fs += ~[{ident: f.ident, pat: fld.fold_pat(f.pat)}];
             }
             pat_rec(fs, etc)
diff --git a/src/comp/syntax/parse/eval.rs b/src/comp/syntax/parse/eval.rs
index 6dd06a97901..fb52960517d 100644
--- a/src/comp/syntax/parse/eval.rs
+++ b/src/comp/syntax/parse/eval.rs
@@ -29,7 +29,7 @@ fn eval_crate_directives(cx: ctx, cdirs: &[@ast::crate_directive],
                          prefix: str,
                          view_items: &mutable [@ast::view_item],
                          items: &mutable [@ast::item]) {
-    for sub_cdir: @ast::crate_directive  in cdirs {
+    for sub_cdir: @ast::crate_directive in cdirs {
         eval_crate_directive(cx, sub_cdir, prefix, view_items, items);
     }
 }
diff --git a/src/comp/syntax/parse/lexer.rs b/src/comp/syntax/parse/lexer.rs
index 4ceb5ba1df5..edeb6df407b 100644
--- a/src/comp/syntax/parse/lexer.rs
+++ b/src/comp/syntax/parse/lexer.rs
@@ -166,7 +166,7 @@ fn consume_block_comment(rdr: &reader) {
 
 fn digits_to_string(s: str) -> int {
     let accum_int: int = 0;
-    for c: u8  in s {
+    for c: u8 in s {
         accum_int *= 10;
         accum_int += dec_digit_val(c as char);
     }
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index 8b7621b9018..93cdf617a63 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -355,7 +355,7 @@ fn parse_ty_field(p: &parser) -> ast::ty_field {
 // otherwise, fail
 fn ident_index(p: &parser, args: &[ast::arg], i: &ast::ident) -> uint {
     let j = 0u;
-    for a: ast::arg  in args { if a.ident == i { ret j; } j += 1u; }
+    for a: ast::arg in args { if a.ident == i { ret j; } j += 1u; }
     p.fatal("Unbound variable " + i + " in constraint arg");
 }
 
@@ -1219,7 +1219,7 @@ const ternary_prec: int = 0;
 fn parse_more_binops(p: &parser, lhs: @ast::expr, min_prec: int) ->
    @ast::expr {
     let peeked = p.peek();
-    for cur: op_spec  in *p.get_prec_table() {
+    for cur: op_spec in *p.get_prec_table() {
         if cur.prec > min_prec && cur.tok == peeked {
             p.bump();
             let rhs = parse_more_binops(p, parse_prefix_expr(p), cur.prec);
@@ -2123,7 +2123,7 @@ fn parse_item_tag(p: &parser, attrs: &[ast::attribute]) -> @ast::item {
                 let arg_tys =
                     parse_seq(token::LPAREN, token::RPAREN,
                               some(token::COMMA), bind parse_ty(_, false), p);
-                for ty: @ast::ty  in arg_tys.node {
+                for ty: @ast::ty in arg_tys.node {
                     args += ~[{ty: ty, id: p.get_id()}];
                 }
                 vhi = arg_tys.span.hi;
diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs
index c9481a3fb23..e0389c47874 100644
--- a/src/comp/syntax/print/pprust.rs
+++ b/src/comp/syntax/print/pprust.rs
@@ -218,7 +218,7 @@ fn synth_comment(s: &ps, text: str) {
 fn commasep[IN](s: &ps, b: breaks, elts: &[IN], op: fn(&ps, &IN) ) {
     box(s, 0u, b);
     let first = true;
-    for elt: IN  in elts {
+    for elt: IN in elts {
         if first { first = false; } else { word_space(s, ","); }
         op(s, elt);
     }
@@ -231,7 +231,7 @@ fn commasep_cmnt[IN](s: &ps, b: breaks, elts: &[IN], op: fn(&ps, &IN) ,
     box(s, 0u, b);
     let len = ivec::len[IN](elts);
     let i = 0u;
-    for elt: IN  in elts {
+    for elt: IN in elts {
         maybe_print_comment(s, get_span(elt).hi);
         op(s, elt);
         i += 1u;
@@ -252,19 +252,19 @@ fn commasep_exprs(s: &ps, b: breaks, exprs: &[@ast::expr]) {
 
 fn print_mod(s: &ps, _mod: &ast::_mod, attrs: &[ast::attribute]) {
     print_inner_attributes(s, attrs);
-    for vitem: @ast::view_item  in _mod.view_items {
+    for vitem: @ast::view_item in _mod.view_items {
         print_view_item(s, vitem);
     }
-    for item: @ast::item  in _mod.items { print_item(s, item); }
+    for item: @ast::item in _mod.items { print_item(s, item); }
 }
 
 fn print_native_mod(s: &ps, nmod: &ast::native_mod,
                     attrs: &[ast::attribute]) {
     print_inner_attributes(s, attrs);
-    for vitem: @ast::view_item  in nmod.view_items {
+    for vitem: @ast::view_item in nmod.view_items {
         print_view_item(s, vitem);
     }
-    for item: @ast::native_item  in nmod.items { print_native_item(s, item); }
+    for item: @ast::native_item in nmod.items { print_native_item(s, item); }
 }
 
 fn print_type(s: &ps, ty: &@ast::ty) {
@@ -330,7 +330,7 @@ fn print_type(s: &ps, ty: &@ast::ty) {
       ast::ty_obj(methods) {
         head(s, "obj");
         bopen(s);
-        for m: ast::ty_method  in methods {
+        for m: ast::ty_method in methods {
             hardbreak_if_not_bol(s);
             cbox(s, indent_unit);
             maybe_print_comment(s, m.span.lo);
@@ -471,7 +471,7 @@ fn print_item(s: &ps, item: &@ast::item) {
             end(s);
         } else {
             bopen(s);
-            for v: ast::variant  in variants {
+            for v: ast::variant in variants {
                 space(s.s);
                 maybe_print_comment(s, v.span.lo);
                 word(s.s, v.node.name);
@@ -506,7 +506,7 @@ fn print_item(s: &ps, item: &@ast::item) {
         pclose(s);
         space(s.s);
         bopen(s);
-        for meth: @ast::method  in _obj.methods {
+        for meth: @ast::method in _obj.methods {
             let typarams: [ast::ty_param] = ~[];
             hardbreak_if_not_bol(s);
             maybe_print_comment(s, meth.span.lo);
@@ -534,7 +534,7 @@ fn print_item(s: &ps, item: &@ast::item) {
 
 fn print_outer_attributes(s: &ps, attrs: &[ast::attribute]) {
     let count = 0;
-    for attr: ast::attribute  in attrs {
+    for attr: ast::attribute in attrs {
         alt attr.node.style {
           ast::attr_outer. { print_attribute(s, attr); count += 1; }
           _ {/* fallthrough */ }
@@ -545,7 +545,7 @@ fn print_outer_attributes(s: &ps, attrs: &[ast::attribute]) {
 
 fn print_inner_attributes(s: &ps, attrs: &[ast::attribute]) {
     let count = 0;
-    for attr: ast::attribute  in attrs {
+    for attr: ast::attribute in attrs {
         alt attr.node.style {
           ast::attr_inner. {
             print_attribute(s, attr);
@@ -594,7 +594,7 @@ fn print_possibly_embedded_block(s: &ps, blk: &ast::blk, embedded: embed_type,
     }
 
     let last_stmt = option::none;
-    for st: @ast::stmt  in blk.node.stmts {
+    for st: @ast::stmt in blk.node.stmts {
         maybe_protect_unop(s, last_stmt, stmt_(st));
         print_stmt(s, *st);
         last_stmt = option::some(st);
@@ -856,12 +856,12 @@ fn print_expr(s: &ps, expr: &@ast::expr) {
         print_expr(s, expr);
         space(s.s);
         bopen(s);
-        for arm: ast::arm  in arms {
+        for arm: ast::arm in arms {
             space(s.s);
             cbox(s, alt_indent_unit);
             ibox(s, 0u);
             let first = true;
-            for p: @ast::pat  in arm.pats {
+            for p: @ast::pat in arm.pats {
                 if first {
                     first = false;
                 } else { space(s.s); word_space(s, "|"); }
@@ -1126,7 +1126,7 @@ fn print_path(s: &ps, path: &ast::path) {
     maybe_print_comment(s, path.span.lo);
     if path.node.global { word(s.s, "::"); }
     let first = true;
-    for id: str  in path.node.idents {
+    for id: str in path.node.idents {
         if first { first = false; } else { word(s.s, "::"); }
         word(s.s, id);
     }
@@ -1293,7 +1293,7 @@ fn print_view_item(s: &ps, item: &@ast::view_item) {
             word_space(s, "=");
         }
         let first = true;
-        for elt: str  in ids {
+        for elt: str in ids {
             if first { first = false; } else { word(s.s, "::"); }
             word(s.s, elt);
         }
@@ -1301,7 +1301,7 @@ fn print_view_item(s: &ps, item: &@ast::view_item) {
       ast::view_item_import_glob(ids, _) {
         head(s, "import");
         let first = true;
-        for elt: str  in ids {
+        for elt: str in ids {
             if first { first = false; } else { word(s.s, "::"); }
             word(s.s, elt);
         }
@@ -1320,7 +1320,7 @@ fn print_view_item(s: &ps, item: &@ast::view_item) {
 // FIXME: The fact that this builds up the table anew for every call is
 // not good. Eventually, table should be a const.
 fn operator_prec(op: ast::binop) -> int {
-    for spec: parse::parser::op_spec  in *parse::parser::prec_table() {
+    for spec: parse::parser::op_spec in *parse::parser::prec_table() {
         if spec.op == op { ret spec.prec; }
     }
     fail;
@@ -1497,7 +1497,7 @@ fn print_comment(s: &ps, cmnt: lexer::cmnt) {
       }
       lexer::isolated. {
         pprust::hardbreak_if_not_bol(s);
-        for line: str  in cmnt.lines { word(s.s, line); hardbreak(s.s); }
+        for line: str in cmnt.lines { word(s.s, line); hardbreak(s.s); }
       }
       lexer::trailing. {
         word(s.s, " ");
@@ -1506,7 +1506,7 @@ fn print_comment(s: &ps, cmnt: lexer::cmnt) {
             hardbreak(s.s);
         } else {
             ibox(s, 0u);
-            for line: str  in cmnt.lines { word(s.s, line); hardbreak(s.s); }
+            for line: str in cmnt.lines { word(s.s, line); hardbreak(s.s); }
             end(s);
         }
       }
@@ -1571,7 +1571,7 @@ fn constr_args_to_str[T](f: &fn(&T) -> str ,
                          args: &[@ast::sp_constr_arg[T]]) -> str {
     let comma = false;
     let s = "(";
-    for a: @ast::sp_constr_arg[T]  in args {
+    for a: @ast::sp_constr_arg[T] in args {
         if comma { s += ", "; } else { comma = true; }
         s += constr_arg_to_str[T](f, a.node);
     }
@@ -1602,7 +1602,7 @@ fn ast_ty_fn_constr_to_str(c: &@ast::constr) -> str {
 fn ast_ty_fn_constrs_str(constrs: &[@ast::constr]) -> str {
     let s = "";
     let colon = true;
-    for c: @ast::constr  in constrs {
+    for c: @ast::constr in constrs {
         if colon { s += " : "; colon = false; } else { s += ", "; }
         s += ast_ty_fn_constr_to_str(c);
     }
@@ -1624,7 +1624,7 @@ fn ast_fn_constrs_str(decl: &ast::fn_decl,
                       constrs: &[@ast::constr]) -> str {
     let s = "";
     let colon = true;
-    for c: @ast::constr  in constrs {
+    for c: @ast::constr in constrs {
         if colon { s += " : "; colon = false; } else { s += ", "; }
         s += ast_fn_constr_to_str(decl, c);
     }
@@ -1649,7 +1649,7 @@ fn ty_constr_to_str(c: &@ast::ty_constr) -> str {
 fn ast_ty_constrs_str(constrs: &[@ast::ty_constr]) -> str {
     let s = "";
     let colon = true;
-    for c: @ast::ty_constr  in constrs {
+    for c: @ast::ty_constr in constrs {
         if colon { s += " : "; colon = false; } else { s += ", "; }
         s += ty_constr_to_str(c);
     }
diff --git a/src/comp/syntax/visit.rs b/src/comp/syntax/visit.rs
index 2f366621c28..c4f6395c72f 100644
--- a/src/comp/syntax/visit.rs
+++ b/src/comp/syntax/visit.rs
@@ -60,7 +60,7 @@ fn visit_crate_directive[E](cd: &@crate_directive, e: &E, v: &vt[E]) {
     alt cd.node {
       cdir_src_mod(_, _, _) { }
       cdir_dir_mod(_, _, cdirs, _) {
-        for cdir: @crate_directive  in cdirs {
+        for cdir: @crate_directive in cdirs {
             visit_crate_directive(cdir, e, v);
         }
       }
@@ -71,8 +71,8 @@ fn visit_crate_directive[E](cd: &@crate_directive, e: &E, v: &vt[E]) {
 }
 
 fn visit_mod[E](m: &_mod, sp: &span, e: &E, v: &vt[E]) {
-    for vi: @view_item  in m.view_items { v.visit_view_item(vi, e, v); }
-    for i: @item  in m.items { v.visit_item(i, e, v); }
+    for vi: @view_item in m.view_items { v.visit_view_item(vi, e, v); }
+    for i: @item in m.items { v.visit_item(i, e, v); }
 }
 
 fn visit_view_item[E](vi: &@view_item, e: &E, v: &vt[E]) { }
@@ -89,21 +89,21 @@ fn visit_item[E](i: &@item, e: &E, v: &vt[E]) {
       item_fn(f, tp) { v.visit_fn(f, tp, i.span, some(i.ident), i.id, e, v); }
       item_mod(m) { v.visit_mod(m, i.span, e, v); }
       item_native_mod(nm) {
-        for vi: @view_item  in nm.view_items { v.visit_view_item(vi, e, v); }
-        for ni: @native_item  in nm.items { v.visit_native_item(ni, e, v); }
+        for vi: @view_item in nm.view_items { v.visit_view_item(vi, e, v); }
+        for ni: @native_item in nm.items { v.visit_native_item(ni, e, v); }
       }
       item_ty(t, _) { v.visit_ty(t, e, v); }
       item_res(f, dtor_id, tps, _) {
         v.visit_fn(f, tps, i.span, some(i.ident), dtor_id, e, v);
       }
       item_tag(variants, _) {
-        for vr: variant  in variants {
-            for va: variant_arg  in vr.node.args { v.visit_ty(va.ty, e, v); }
+        for vr: variant in variants {
+            for va: variant_arg in vr.node.args { v.visit_ty(va.ty, e, v); }
         }
       }
       item_obj(ob, _, _) {
-        for f: obj_field  in ob.fields { v.visit_ty(f.ty, e, v); }
-        for m: @method  in ob.methods {
+        for f: obj_field in ob.fields { v.visit_ty(f.ty, e, v); }
+        for m: @method in ob.methods {
             v.visit_fn(m.node.meth, ~[], m.span, some(m.node.ident),
                        m.node.id, e, v);
         }
@@ -131,29 +131,29 @@ fn visit_ty[E](t: &@ty, e: &E, v: &vt[E]) {
       ty_chan(t) { v.visit_ty(t, e, v); }
       ty_task. {/* no-op */ }
       ty_rec(flds) {
-        for f: ty_field  in flds { v.visit_ty(f.node.mt.ty, e, v); }
+        for f: ty_field in flds { v.visit_ty(f.node.mt.ty, e, v); }
       }
       ty_tup(ts) {
         for tt in ts { v.visit_ty(tt, e, v); }
       }
       ty_fn(_, args, out, _, constrs) {
-        for a: ty_arg  in args { v.visit_ty(a.node.ty, e, v); }
-        for c: @constr  in constrs {
+        for a: ty_arg in args { v.visit_ty(a.node.ty, e, v); }
+        for c: @constr in constrs {
             v.visit_constr(c.node.path, c.span, c.node.id, e, v);
         }
         v.visit_ty(out, e, v);
       }
       ty_obj(tmeths) {
-        for m: ty_method  in tmeths {
-            for a: ty_arg  in m.node.inputs { v.visit_ty(a.node.ty, e, v); }
+        for m: ty_method in tmeths {
+            for a: ty_arg in m.node.inputs { v.visit_ty(a.node.ty, e, v); }
             v.visit_ty(m.node.output, e, v);
         }
       }
-      ty_path(p, _) { for tp: @ty  in p.node.types { v.visit_ty(tp, e, v); } }
+      ty_path(p, _) { for tp: @ty in p.node.types { v.visit_ty(tp, e, v); } }
       ty_type. {/* no-op */ }
       ty_constr(t, cs) {
         v.visit_ty(t, e, v);
-        for tc: @spanned[constr_general_[path, node_id]]  in cs {
+        for tc: @spanned[constr_general_[path, node_id]] in cs {
             v.visit_constr(tc.node.path, tc.span, tc.node.id, e, v);
         }
       }
@@ -169,11 +169,11 @@ fn visit_constr[E](operator: &path, sp: &span, id: node_id, e: &E,
 fn visit_pat[E](p: &@pat, e: &E, v: &vt[E]) {
     alt p.node {
       pat_tag(path, children) {
-        for tp: @ty  in path.node.types { v.visit_ty(tp, e, v); }
-        for child: @pat  in children { v.visit_pat(child, e, v); }
+        for tp: @ty in path.node.types { v.visit_ty(tp, e, v); }
+        for child: @pat in children { v.visit_pat(child, e, v); }
       }
       pat_rec(fields, _) {
-        for f: field_pat  in fields { v.visit_pat(f.pat, e, v); }
+        for f: field_pat in fields { v.visit_pat(f.pat, e, v); }
       }
       pat_tup(elts) {
         for elt in elts { v.visit_pat(elt, e, v); }
@@ -191,8 +191,8 @@ fn visit_native_item[E](ni: &@native_item, e: &E, v: &vt[E]) {
 }
 
 fn visit_fn_decl[E](fd: &fn_decl, e: &E, v: &vt[E]) {
-    for a: arg  in fd.inputs { v.visit_ty(a.ty, e, v); }
-    for c: @constr  in fd.constraints {
+    for a: arg in fd.inputs { v.visit_ty(a.ty, e, v); }
+    for c: @constr in fd.constraints {
         v.visit_constr(c.node.path, c.span, c.node.id, e, v);
     }
     v.visit_ty(fd.output, e, v);
@@ -205,7 +205,7 @@ fn visit_fn[E](f: &_fn, tp: &[ty_param], sp: &span, i: &fn_ident, id: node_id,
 }
 
 fn visit_block[E](b: &ast::blk, e: &E, v: &vt[E]) {
-    for s: @stmt  in b.node.stmts { v.visit_stmt(s, e, v); }
+    for s: @stmt in b.node.stmts { v.visit_stmt(s, e, v); }
     visit_expr_opt(b.node.expr, e, v);
 }
 
@@ -220,7 +220,7 @@ fn visit_stmt[E](s: &@stmt, e: &E, v: &vt[E]) {
 fn visit_decl[E](d: &@decl, e: &E, v: &vt[E]) {
     alt d.node {
       decl_local(locs) {
-        for loc: @ast::local  in locs { v.visit_local(loc, e, v); }
+        for loc: @ast::local in locs { v.visit_local(loc, e, v); }
       }
       decl_item(it) { v.visit_item(it, e, v); }
     }
@@ -231,7 +231,7 @@ fn visit_expr_opt[E](eo: option::t[@expr], e: &E, v: &vt[E]) {
 }
 
 fn visit_exprs[E](exprs: &[@expr], e: &E, v: &vt[E]) {
-    for ex: @expr  in exprs { v.visit_expr(ex, e, v); }
+    for ex: @expr in exprs { v.visit_expr(ex, e, v); }
 }
 
 fn visit_mac[E](m: mac, e: &E, v: &vt[E]) {
@@ -247,7 +247,7 @@ fn visit_expr[E](ex: &@expr, e: &E, v: &vt[E]) {
     alt ex.node {
       expr_vec(es, _, _) { visit_exprs(es, e, v); }
       expr_rec(flds, base) {
-        for f: field  in flds { v.visit_expr(f.node.expr, e, v); }
+        for f: field in flds { v.visit_expr(f.node.expr, e, v); }
         visit_expr_opt(base, e, v);
       }
       expr_tup(elts) {
@@ -260,7 +260,7 @@ fn visit_expr[E](ex: &@expr, e: &E, v: &vt[E]) {
       expr_self_method(_) { }
       expr_bind(callee, args) {
         v.visit_expr(callee, e, v);
-        for eo: option::t[@expr]  in args { visit_expr_opt(eo, e, v); }
+        for eo: option::t[@expr] in args { visit_expr_opt(eo, e, v); }
       }
       expr_spawn(_, _, callee, args) {
         v.visit_expr(callee, e, v);
@@ -294,7 +294,7 @@ fn visit_expr[E](ex: &@expr, e: &E, v: &vt[E]) {
       expr_do_while(b, x) { v.visit_block(b, e, v); v.visit_expr(x, e, v); }
       expr_alt(x, arms) {
         v.visit_expr(x, e, v);
-        for a: arm  in arms { v.visit_arm(a, e, v); }
+        for a: arm in arms { v.visit_arm(a, e, v); }
       }
       expr_fn(f) { v.visit_fn(f, ~[], ex.span, none, ex.id, e, v); }
       expr_block(b) { v.visit_block(b, e, v); }
@@ -310,7 +310,7 @@ fn visit_expr[E](ex: &@expr, e: &E, v: &vt[E]) {
       expr_recv(a, b) { v.visit_expr(a, e, v); v.visit_expr(b, e, v); }
       expr_field(x, _) { v.visit_expr(x, e, v); }
       expr_index(a, b) { v.visit_expr(a, e, v); v.visit_expr(b, e, v); }
-      expr_path(p) { for tp: @ty  in p.node.types { v.visit_ty(tp, e, v); } }
+      expr_path(p) { for tp: @ty in p.node.types { v.visit_ty(tp, e, v); } }
       expr_fail(eo) { visit_expr_opt(eo, e, v); }
       expr_break. { }
       expr_cont. { }
@@ -326,7 +326,7 @@ fn visit_expr[E](ex: &@expr, e: &E, v: &vt[E]) {
         alt anon_obj.fields {
           none. { }
           some(fields) {
-            for f: anon_obj_field  in fields {
+            for f: anon_obj_field in fields {
                 v.visit_ty(f.ty, e, v);
                 v.visit_expr(f.expr, e, v);
             }
@@ -336,7 +336,7 @@ fn visit_expr[E](ex: &@expr, e: &E, v: &vt[E]) {
           none. { }
           some(ex) { v.visit_expr(ex, e, v); }
         }
-        for m: @method  in anon_obj.methods {
+        for m: @method in anon_obj.methods {
             v.visit_fn(m.node.meth, ~[], m.span, some(m.node.ident),
                        m.node.id, e, v);
         }
@@ -347,7 +347,7 @@ fn visit_expr[E](ex: &@expr, e: &E, v: &vt[E]) {
 }
 
 fn visit_arm[E](a: &arm, e: &E, v: &vt[E]) {
-    for p: @pat  in a.pats { v.visit_pat(p, e, v); }
+    for p: @pat in a.pats { v.visit_pat(p, e, v); }
     v.visit_block(a.body, e, v);
 }