summary refs log tree commit diff
path: root/src/libsyntax/syntax.rc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-20 12:04:47 -0700
committerbors <bors@rust-lang.org>2013-05-20 12:04:47 -0700
commit26babaafcdbcfdf2e842d84dbeabbed0dae6efef (patch)
tree51ba2c1f043882643de9ca2957d9efab24335a91 /src/libsyntax/syntax.rc
parentf3b458b5c5a555067e9d013066fac9c8de50c3f8 (diff)
parentb71a1ecea2de87cff3089f9f261be71cd314aac9 (diff)
downloadrust-26babaafcdbcfdf2e842d84dbeabbed0dae6efef.tar.gz
rust-26babaafcdbcfdf2e842d84dbeabbed0dae6efef.zip
auto merge of #6559 : jbclements/rust/hygiene-fns-and-cleanup, r=jbclements
This includes new, tested, hygiene support functions. It also removes the interner_key! macro and replaces it with a function, which should be inline-able. It also contains some parser patch-ups and some docfixes.

On my machine, this patch passes all tests.
Diffstat (limited to 'src/libsyntax/syntax.rc')
-rw-r--r--src/libsyntax/syntax.rc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/syntax.rc b/src/libsyntax/syntax.rc
index 0d9b7ca429e..0650df57603 100644
--- a/src/libsyntax/syntax.rc
+++ b/src/libsyntax/syntax.rc
@@ -25,11 +25,10 @@
 
 extern mod std;
 
-// allow the interner_key macro
-// to escape this module:
-#[macro_escape]
 pub mod util {
     pub mod interner;
+    #[cfg(test)]
+    pub mod parser_testing;
 }
 
 pub mod syntax {