rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

auto merge of #5212 : thestinger/rust/iter, r=graydon

Browse Source 
A small step towards fixing #2827
This commit is contained in:
bors
2013-03-05 02:06:50 -08:00
parent 75c5bc90d2 af645e8487
commit eddefbc893
39 changed files with 120 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsyntax/print/pprust.rs
View File

@@ -732,7 +732,7 @@ pub fn print_struct(s: @ps,
nbsp(s);
bopen(s);
hardbreak_if_not_bol(s);
do struct_def.dtor.iter |dtor| {
for struct_def.dtor.each |dtor| {
hardbreak_if_not_bol(s);
maybe_print_comment(s, dtor.span.lo);
print_outer_attributes(s, dtor.node.attrs);
@@ -1271,10 +1271,10 @@ pub fn print_expr(s: @ps, &&expr: @ast::expr) {
ast::expr_loop(ref blk, opt_ident) => {
head(s, ~"loop");
space(s.s);
opt_ident.iter(|ident| {
for opt_ident.each |ident| {
print_ident(s, *ident);
word_space(s, ~":");
});
}
print_block(s, blk);
}
ast::expr_match(expr, ref arms) => {
@@ -1422,12 +1422,12 @@ pub fn print_expr(s: @ps, &&expr: @ast::expr) {
ast::expr_break(opt_ident) => {
word(s.s, ~"break");
space(s.s);
opt_ident.iter(|ident| {print_ident(s, *ident); space(s.s)});
for opt_ident.each |ident| { print_ident(s, *ident); space(s.s) }
}
ast::expr_again(opt_ident) => {
word(s.s, ~"loop");
space(s.s);
opt_ident.iter(|ident| {print_ident(s, *ident); space(s.s)});
for opt_ident.each |ident| { print_ident(s, *ident); space(s.s) }
}
ast::expr_ret(result) => {
word(s.s, ~"return");
@@ -1667,7 +1667,7 @@ pub fn print_pat(s: @ps, &&pat: @ast::pat, refutable: bool) {
ast::pat_vec(elts, tail) => {
word(s.s, ~"[");
commasep(s, inconsistent, elts, |s, p| print_pat(s, p, refutable));
do option::iter(&tail) |tail| {
for tail.each |tail| {
if vec::len(elts) != 0u { word_space(s, ~","); }
word(s.s, ~"..");
print_pat(s, *tail, refutable);