diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/deriving/default.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/zero.rs | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/libsyntax/ext/deriving/default.rs b/src/libsyntax/ext/deriving/default.rs index 0c7bbefc690..d8c78842808 100644 --- a/src/libsyntax/ext/deriving/default.rs +++ b/src/libsyntax/ext/deriving/default.rs @@ -47,9 +47,7 @@ fn default_substructure(cx: @ExtCtxt, span: Span, substr: &Substructure) -> @Exp cx.ident_of("Default"), cx.ident_of("default") ]; - let default_call = || { - cx.expr_call_global(span, default_ident.clone(), ~[]) - }; + let default_call = cx.expr_call_global(span, default_ident.clone(), ~[]); return match *substr.fields { StaticStruct(_, ref summary) => { @@ -58,13 +56,13 @@ fn default_substructure(cx: @ExtCtxt, span: Span, substr: &Substructure) -> @Exp if count == 0 { cx.expr_ident(span, substr.type_ident) } else { - let exprs = vec::from_fn(count, |_| default_call()); + let exprs = vec::from_elem(count, default_call); cx.expr_call_ident(span, substr.type_ident, exprs) } } Right(ref fields) => { let default_fields = do fields.map |ident| { - cx.field_imm(span, *ident, default_call()) + cx.field_imm(span, *ident, default_call) }; cx.expr_struct_ident(span, substr.type_ident, default_fields) } diff --git a/src/libsyntax/ext/deriving/zero.rs b/src/libsyntax/ext/deriving/zero.rs index fc527d44b53..2546cfc2e39 100644 --- a/src/libsyntax/ext/deriving/zero.rs +++ b/src/libsyntax/ext/deriving/zero.rs @@ -62,9 +62,7 @@ fn zero_substructure(cx: @ExtCtxt, span: Span, substr: &Substructure) -> @Expr { cx.ident_of("Zero"), cx.ident_of("zero") ]; - let zero_call = || { - cx.expr_call_global(span, zero_ident.clone(), ~[]) - }; + let zero_call = cx.expr_call_global(span, zero_ident.clone(), ~[]); return match *substr.fields { StaticStruct(_, ref summary) => { @@ -73,13 +71,13 @@ fn zero_substructure(cx: @ExtCtxt, span: Span, substr: &Substructure) -> @Expr { if count == 0 { cx.expr_ident(span, substr.type_ident) } else { - let exprs = vec::from_fn(count, |_| zero_call()); + let exprs = vec::from_elem(count, zero_call); cx.expr_call_ident(span, substr.type_ident, exprs) } } Right(ref fields) => { let zero_fields = do fields.map |ident| { - cx.field_imm(span, *ident, zero_call()) + cx.field_imm(span, *ident, zero_call) }; cx.expr_struct_ident(span, substr.type_ident, zero_fields) } |