about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-07-31 16:53:14 -0700
committerBrian Anderson <banderson@mozilla.com>2012-07-31 17:22:30 -0700
commit7d18369804f23cd04d10f33e420fbcdc8ea76ecf (patch)
tree85518eb2d912c8de1ac2082a59774b69d5dee28a /src
parent2cfe8fb357f8ad7e99dc03b09e0ec5fa1c2c9029 (diff)
downloadrust-7d18369804f23cd04d10f33e420fbcdc8ea76ecf.tar.gz
rust-7d18369804f23cd04d10f33e420fbcdc8ea76ecf.zip
syntax: Rename 'module' extension to 'module_path'
Diffstat (limited to 'src')
-rw-r--r--src/libsyntax/ext/base.rs2
-rw-r--r--src/test/run-pass/syntax-extension-source-utils.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index a51bc8a994c..e8505387fa8 100644
--- a/src/libsyntax/ext/base.rs
+++ b/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));
diff --git a/src/test/run-pass/syntax-extension-source-utils.rs b/src/test/run-pass/syntax-extension-source-utils.rs
index 4f8fa28227d..3f7355a131c 100644
--- a/src/test/run-pass/syntax-extension-source-utils.rs
+++ b/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!{} }
     }
 }