Skip to content

Commit b232f6d

Browse files
committed
Avoid loading and parsing unconfigured non-inline modules.
1 parent 5a5736d commit b232f6d

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

src/libsyntax/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl<'a> StripUnconfigured<'a> {
126126
}
127127

128128
// Determine if a node with the given attributes should be included in this configuation.
129-
fn in_cfg(&mut self, attrs: &[ast::Attribute]) -> bool {
129+
pub fn in_cfg(&mut self, attrs: &[ast::Attribute]) -> bool {
130130
attrs.iter().all(|attr| {
131131
// When not compiling with --test we should not compile the #[test] functions
132132
if !self.should_test && is_test_or_bench(attr) {

src/libsyntax/parse/parser.rs

+18-9
Original file line numberDiff line numberDiff line change
@@ -5291,20 +5291,29 @@ impl<'a> Parser<'a> {
52915291

52925292
/// Parse a `mod <foo> { ... }` or `mod <foo>;` item
52935293
fn parse_item_mod(&mut self, outer_attrs: &[Attribute]) -> PResult<'a, ItemInfo> {
5294-
let outer_attrs = ::config::StripUnconfigured {
5295-
config: &self.cfg,
5296-
sess: self.sess,
5297-
should_test: false, // irrelevant
5298-
features: None, // don't perform gated feature checking
5299-
}.process_cfg_attrs(outer_attrs.to_owned());
5294+
let (in_cfg, outer_attrs) = {
5295+
let mut strip_unconfigured = ::config::StripUnconfigured {
5296+
config: &self.cfg,
5297+
sess: self.sess,
5298+
should_test: false, // irrelevant
5299+
features: None, // don't perform gated feature checking
5300+
};
5301+
let outer_attrs = strip_unconfigured.process_cfg_attrs(outer_attrs.to_owned());
5302+
(strip_unconfigured.in_cfg(&outer_attrs), outer_attrs)
5303+
};
53005304

53015305
let id_span = self.span;
53025306
let id = self.parse_ident()?;
53035307
if self.check(&token::Semi) {
53045308
self.bump();
5305-
// This mod is in an external file. Let's go get it!
5306-
let (m, attrs) = self.eval_src_mod(id, &outer_attrs, id_span)?;
5307-
Ok((id, m, Some(attrs)))
5309+
if in_cfg {
5310+
// This mod is in an external file. Let's go get it!
5311+
let (m, attrs) = self.eval_src_mod(id, &outer_attrs, id_span)?;
5312+
Ok((id, m, Some(attrs)))
5313+
} else {
5314+
let placeholder = ast::Mod { inner: syntax_pos::DUMMY_SP, items: Vec::new() };
5315+
Ok((id, ItemKind::Mod(placeholder), None))
5316+
}
53085317
} else {
53095318
let directory = self.directory.clone();
53105319
self.push_directory(id, &outer_attrs);

0 commit comments

Comments
 (0)