summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorJeffrey Seyfried <jeffrey.seyfried@gmail.com>2016-08-31 23:39:16 +0000
committerJeffrey Seyfried <jeffrey.seyfried@gmail.com>2016-09-05 04:53:16 +0000
commit9b3bc7a9e9e35537823bc2a10fc078c1222ee7fd (patch)
tree1698bab31e5af0348bbb99f1a2def0b9262be3c0 /src/libsyntax/ext
parent234d68b7d35687999c36bc39ffd414bca7373a48 (diff)
downloadrust-9b3bc7a9e9e35537823bc2a10fc078c1222ee7fd.tar.gz
rust-9b3bc7a9e9e35537823bc2a10fc078c1222ee7fd.zip
Remove `syntax::config::strip_unconfigured`, add `syntax::config::features`.
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/expand.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 6f8af66632f..92d053fd21b 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -719,8 +719,9 @@ pub fn expand_crate_with_expander(expander: &mut MacroExpander,
     }
 
     let items = SmallVector::many(c.module.items);
-    expander.load_macros(&items);
-    c.module.items = items.into();
+    let configured = items.fold_with(&mut expander.strip_unconfigured());
+    expander.load_macros(&configured);
+    c.module.items = configured.into();
 
     let err_count = expander.cx.parse_sess.span_diagnostic.err_count();
     let mut ret = expander.fold_crate(c);