Support cfg_attr
on path
attributes
This commit is contained in:
parent
ea0dc92972
commit
db57e67452
2 changed files with 10 additions and 3 deletions
|
@ -33,7 +33,7 @@ impl<'a> StripUnconfigured<'a> {
|
||||||
if self.in_cfg(node.attrs()) { Some(node) } else { None }
|
if self.in_cfg(node.attrs()) { Some(node) } else { None }
|
||||||
}
|
}
|
||||||
|
|
||||||
fn process_cfg_attrs<T: HasAttrs>(&mut self, node: T) -> T {
|
pub fn process_cfg_attrs<T: HasAttrs>(&mut self, node: T) -> T {
|
||||||
node.map_attrs(|attrs| {
|
node.map_attrs(|attrs| {
|
||||||
attrs.into_iter().filter_map(|attr| self.process_cfg_attr(attr)).collect()
|
attrs.into_iter().filter_map(|attr| self.process_cfg_attr(attr)).collect()
|
||||||
})
|
})
|
||||||
|
|
|
@ -5301,15 +5301,22 @@ impl<'a> Parser<'a> {
|
||||||
|
|
||||||
/// Parse a `mod <foo> { ... }` or `mod <foo>;` item
|
/// Parse a `mod <foo> { ... }` or `mod <foo>;` item
|
||||||
fn parse_item_mod(&mut self, outer_attrs: &[Attribute]) -> PResult<'a, ItemInfo> {
|
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_span = self.span;
|
||||||
let id = self.parse_ident()?;
|
let id = self.parse_ident()?;
|
||||||
if self.check(&token::Semi) {
|
if self.check(&token::Semi) {
|
||||||
self.bump();
|
self.bump();
|
||||||
// This mod is in an external file. Let's go get it!
|
// 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)))
|
Ok((id, m, Some(attrs)))
|
||||||
} else {
|
} else {
|
||||||
self.push_mod_path(id, outer_attrs);
|
self.push_mod_path(id, &outer_attrs);
|
||||||
self.expect(&token::OpenDelim(token::Brace))?;
|
self.expect(&token::OpenDelim(token::Brace))?;
|
||||||
let mod_inner_lo = self.span.lo;
|
let mod_inner_lo = self.span.lo;
|
||||||
let attrs = self.parse_inner_attributes()?;
|
let attrs = self.parse_inner_attributes()?;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue