Skip to content

Commit e018712

Browse files
committed
process cfg'ed off modules
Fixes #1229 Fixes #1277
1 parent 6572874 commit e018712

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/lib.rs

+9-2
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,16 @@ fn parse_input(input: Input,
398398
parse_session: &ParseSess)
399399
-> Result<ast::Crate, Option<DiagnosticBuilder>> {
400400
let result = match input {
401-
Input::File(file) => parse::parse_crate_from_file(&file, parse_session),
401+
Input::File(file) => {
402+
let mut parser = parse::new_parser_from_file(parse_session, &file);
403+
parser.cfg_mods = false;
404+
parser.parse_crate_mod()
405+
}
402406
Input::Text(text) => {
403-
parse::parse_crate_from_source_str("stdin".to_owned(), text, parse_session)
407+
let mut parser =
408+
parse::new_parser_from_source_str(parse_session, "stdin".to_owned(), text);
409+
parser.cfg_mods = false;
410+
parser.parse_crate_mod()
404411
}
405412
};
406413

src/visitor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ impl<'a> FmtVisitor<'a> {
548548
}
549549

550550
pub fn format_separate_mod(&mut self, m: &ast::Mod) {
551-
let filemap = self.codemap.lookup_char_pos(source!(self, m.inner).lo).file;
551+
let filemap = self.codemap.lookup_char_pos(m.inner.lo).file;
552552
self.last_pos = filemap.start_pos;
553553
self.block_indent = Indent::empty();
554554
self.walk_mod_items(m);

0 commit comments

Comments
 (0)