summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-07-31 16:38:41 -0700
committerBrian Anderson <banderson@mozilla.com>2012-07-31 17:22:30 -0700
commit7b2026bf218c416c653faf8bb8cca770d0bb2c0d (patch)
tree9c09c3d7d1b1dcc2d12d11061bf5755727d83128 /src/libsyntax/ext
parent7d18369804f23cd04d10f33e420fbcdc8ea76ecf (diff)
downloadrust-7b2026bf218c416c653faf8bb8cca770d0bb2c0d.tar.gz
rust-7b2026bf218c416c653faf8bb8cca770d0bb2c0d.zip
Introduce 'return', 'match' and 'module' as synonyms
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/expand.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 3805f1a19c6..62e5841a749 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -129,17 +129,17 @@ fn expand_expr(exts: hashmap<~str, syntax_extension>, cx: ext_ctxt,
 // NB: there is some redundancy between this and expand_item, below, and
 // they might benefit from some amount of semantic and language-UI merger.
 fn expand_mod_items(exts: hashmap<~str, syntax_extension>, cx: ext_ctxt,
-                    module: ast::_mod, fld: ast_fold,
+                    module_: ast::_mod, fld: ast_fold,
                     orig: fn@(ast::_mod, ast_fold) -> ast::_mod)
     -> ast::_mod
 {
     // Fold the contents first:
-    let module = orig(module, fld);
+    let module_ = orig(module_, fld);
 
     // For each item, look through the attributes.  If any of them are
     // decorated with "item decorators", then use that function to transform
     // the item into a new set of items.
-    let new_items = do vec::flat_map(module.items) |item| {
+    let new_items = do vec::flat_map(module_.items) |item| {
         do vec::foldr(item.attrs, ~[item]) |attr, items| {
             let mname = alt attr.node.value.node {
               ast::meta_word(n) { n }
@@ -159,7 +159,7 @@ fn expand_mod_items(exts: hashmap<~str, syntax_extension>, cx: ext_ctxt,
         }
     };
 
-    ret {items: new_items with module};
+    ret {items: new_items with module_};
 }