about summary refs log tree commit diff
path: root/src/libsyntax/ext/deriving
diff options
context:
space:
mode:
authorOGINO Masanori <masanori.ogino@gmail.com>2013-08-02 00:34:59 +0900
committerOGINO Masanori <masanori.ogino@gmail.com>2013-08-02 09:12:05 +0900
commit09efc4e855c2aa4144936af987d4fdde6705a34f (patch)
tree368b18f038b876fdda33b94a1438729e2b843552 /src/libsyntax/ext/deriving
parenteb5743bfb2f634d2f5c8ef484a04e63d1a24cef6 (diff)
downloadrust-09efc4e855c2aa4144936af987d4fdde6705a34f.tar.gz
rust-09efc4e855c2aa4144936af987d4fdde6705a34f.zip
Replace 'blk' -> 'block' in AstBuilder.
I didn't rename variables because they are local and are not parts of
the public interfaces.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
Diffstat (limited to 'src/libsyntax/ext/deriving')
-rw-r--r--src/libsyntax/ext/deriving/encodable.rs2
-rw-r--r--src/libsyntax/ext/deriving/generic.rs2
-rw-r--r--src/libsyntax/ext/deriving/to_str.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/ext/deriving/encodable.rs b/src/libsyntax/ext/deriving/encodable.rs
index eb425ec029a..0a2731f2f87 100644
--- a/src/libsyntax/ext/deriving/encodable.rs
+++ b/src/libsyntax/ext/deriving/encodable.rs
@@ -178,7 +178,7 @@ fn encodable_substructure(cx: @ExtCtxt, span: span,
                                           ~[cx.expr_str(span,
                                             cx.str_of(substr.type_ident)),
                                             blk]);
-            cx.expr_blk(cx.blk(span, ~[me], Some(ret)))
+            cx.expr_block(cx.block(span, ~[me], Some(ret)))
         }
 
         _ => cx.bug("expected Struct or EnumMatching in deriving(Encodable)")
diff --git a/src/libsyntax/ext/deriving/generic.rs b/src/libsyntax/ext/deriving/generic.rs
index cb74f152c1e..61eaa98ae16 100644
--- a/src/libsyntax/ext/deriving/generic.rs
+++ b/src/libsyntax/ext/deriving/generic.rs
@@ -528,7 +528,7 @@ impl<'self> MethodDef<'self> {
 
         let method_ident = cx.ident_of(self.name);
         let fn_decl = cx.fn_decl(args, ret_type);
-        let body_block = cx.blk_expr(body);
+        let body_block = cx.block_expr(body);
 
 
         // Create the method.
diff --git a/src/libsyntax/ext/deriving/to_str.rs b/src/libsyntax/ext/deriving/to_str.rs
index 5a1a847fbc0..c0f472ff456 100644
--- a/src/libsyntax/ext/deriving/to_str.rs
+++ b/src/libsyntax/ext/deriving/to_str.rs
@@ -79,7 +79,7 @@ fn to_str_substructure(cx: @ExtCtxt, span: span,
             }
             push(cx.expr_str(span, end));
 
-            cx.expr_blk(cx.blk(span, stmts, Some(cx.expr_ident(span, buf))))
+            cx.expr_block(cx.block(span, stmts, Some(cx.expr_ident(span, buf))))
         }
     };