mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

to_str -- update to contain scope of closure

Browse Source
This commit is contained in:
Niko Matsakis 2014-02-09 14:08:18 -05:00
parent 0f5baad6ee
commit 0e005ab848
1 changed files with 21 additions and 20 deletions

41
src/libsyntax/ext/deriving/to_str.rs

@ -67,31 +67,32 @@ fn to_str_substructure(cx: &mut ExtCtxt, span: Span, substr: &Substructure)
let mut stmts = ~[cx.stmt_let(span, true, buf, init)]; let mut stmts = ~[cx.stmt_let(span, true, buf, init)];
let push_str = cx.ident_of("push_str"); let push_str = cx.ident_of("push_str");
let push = |s: @Expr| { {
let ebuf = cx.expr_ident(span, buf); let push = |s: @Expr| {
let call = cx.expr_method_call(span, ebuf, push_str, ~[s]); let ebuf = cx.expr_ident(span, buf);
stmts.push(cx.stmt_expr(call)); let call = cx.expr_method_call(span, ebuf, push_str, ~[s]);
}; stmts.push(cx.stmt_expr(call));
};
for (i, &FieldInfo {name, span, self_, .. }) in fields.iter().enumerate() { for (i, &FieldInfo {name, span, self_, .. }) in fields.iter().enumerate() {
if i > 0 { if i > 0 {
push(cx.expr_str(span, InternedString::new(", "))); push(cx.expr_str(span, InternedString::new(", ")));
}
match name {
None => {}
Some(id) => {
let interned_id = token::get_ident(id.name);
let name = interned_id.get() + ": ";
push(cx.expr_str(span,
token::intern_and_get_ident(name)));
} }
match name {
None => {}
Some(id) => {
let interned_id = token::get_ident(id.name);
let name = interned_id.get() + ": ";
push(cx.expr_str(span,
token::intern_and_get_ident(name)));
}
}
push(cx.expr_method_call(span, self_, to_str, ~[]));
} }
push(cx.expr_method_call(span, self_, to_str, ~[])); push(cx.expr_str(span, end));
} }
push(cx.expr_str(span, end));
cx.expr_block(cx.block(span, stmts, Some(cx.expr_ident(span, cx.expr_block(cx.block(span, stmts, Some(cx.expr_ident(span, buf))))
buf))))
} }
}; };