---

yaml
---
r: 20770
b: refs/heads/snap-stage3
c: 7d18369
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 2cfe8fb357f8ad7e99dc03b09e0ec5fa1c2c9029
+refs/heads/snap-stage3: 7d18369804f23cd04d10f33e420fbcdc8ea76ecf
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libsyntax/ext/base.rs

@@ -103,7 +103,7 @@ fn syntax_expander_table() -> hashmap<~str, syntax_extension> {
                             builtin(ext::source_util::expand_include_str));
     syntax_expanders.insert(~"include_bin",
                             builtin(ext::source_util::expand_include_bin));
-    syntax_expanders.insert(~"module",
+    syntax_expanders.insert(~"module_path",
                             builtin(ext::source_util::expand_mod));
     syntax_expanders.insert(~"proto",
                             builtin_item_tt(ext::pipes::expand_proto));

branches/snap-stage3/src/test/run-pass/syntax-extension-source-utils.rs

@@ -3,7 +3,7 @@
 
 mod m1 {
     mod m2 {
-        fn where_am_i() -> ~str { module!{} }
+        fn where_am_i() -> ~str { module_path!{} }
     }
 }