about summary refs log tree commit diff
path: root/src/libsyntax/ext/base.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-10 08:43:01 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-10 08:43:01 -0800
commitbbc8a54c63c843676ce5801cb2e97f0b4e691646 (patch)
tree18995c5fd8d376dac8610e9a58cab6cc817e4f21 /src/libsyntax/ext/base.rs
parentc33acf658a5b6e14d57016ea5a455277f7e0c966 (diff)
parent5354317037368124d180acc3f8754bdb2b0387b8 (diff)
downloadrust-bbc8a54c63c843676ce5801cb2e97f0b4e691646.tar.gz
rust-bbc8a54c63c843676ce5801cb2e97f0b4e691646.zip
rollup merge of #22116: kmcallister/cfg_attr
Fixes #22070.
Fixes #19372.

r? @sfackler
Diffstat (limited to 'src/libsyntax/ext/base.rs')
-rw-r--r--src/libsyntax/ext/base.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index 778b2cabea6..64ae6162ef4 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -528,8 +528,6 @@ fn initial_syntax_expander_table(ecfg: &expand::ExpansionConfig) -> SyntaxEnv {
     syntax_expanders.insert(intern("cfg"),
                             builtin_normal_expander(
                                     ext::cfg::expand_cfg));
-    syntax_expanders.insert(intern("cfg_attr"),
-                            Modifier(box ext::cfg_attr::expand));
     syntax_expanders.insert(intern("trace_macros"),
                             builtin_normal_expander(
                                     ext::trace_macros::expand_trace_macros));