From db57e67452c00a18ac68845717c5c20e3db77888 Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Wed, 29 Jun 2016 09:28:50 +0000 Subject: [PATCH] Support `cfg_attr` on `path` attributes --- src/libsyntax/config.rs | 2 +- src/libsyntax/parse/parser.rs | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/libsyntax/config.rs b/src/libsyntax/config.rs index 961763c6025f..36a4568b693b 100644 --- a/src/libsyntax/config.rs +++ b/src/libsyntax/config.rs @@ -33,7 +33,7 @@ impl<'a> StripUnconfigured<'a> { if self.in_cfg(node.attrs()) { Some(node) } else { None } } - fn process_cfg_attrs(&mut self, node: T) -> T { + pub fn process_cfg_attrs(&mut self, node: T) -> T { node.map_attrs(|attrs| { attrs.into_iter().filter_map(|attr| self.process_cfg_attr(attr)).collect() }) diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 813d90103b88..db101e459dbc 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -5301,15 +5301,22 @@ impl<'a> Parser<'a> { /// Parse a `mod { ... }` or `mod ;` item fn parse_item_mod(&mut self, outer_attrs: &[Attribute]) -> PResult<'a, ItemInfo> { + let outer_attrs = ::config::StripUnconfigured { + config: &self.cfg, + sess: self.sess, + should_test: false, // irrelevant + features: None, // don't perform gated feature checking + }.process_cfg_attrs(outer_attrs.to_owned()); + let id_span = self.span; let id = self.parse_ident()?; if self.check(&token::Semi) { self.bump(); // This mod is in an external file. Let's go get it! - let (m, attrs) = self.eval_src_mod(id, outer_attrs, id_span)?; + let (m, attrs) = self.eval_src_mod(id, &outer_attrs, id_span)?; Ok((id, m, Some(attrs))) } else { - self.push_mod_path(id, outer_attrs); + self.push_mod_path(id, &outer_attrs); self.expect(&token::OpenDelim(token::Brace))?; let mod_inner_lo = self.span.lo; let attrs = self.parse_inner_attributes()?;