diff options
| author | Tinco Andringa <mail@tinco.nl> | 2018-07-12 23:35:40 +0200 |
|---|---|---|
| committer | Tinco Andringa <mail@tinco.nl> | 2018-09-10 12:33:38 +0200 |
| commit | 81a8ee8fc4822a651aaea722d7920c0f780e9041 (patch) | |
| tree | d4dcb8560fa7e5a7d5b30737e6a961871c22637d /src/libsyntax/parse/parser.rs | |
| parent | c3afb16e1608929a816d6c0e2a0118185199aef1 (diff) | |
| download | rust-81a8ee8fc4822a651aaea722d7920c0f780e9041.tar.gz rust-81a8ee8fc4822a651aaea722d7920c0f780e9041.zip | |
pretty=expanded should expand mod declarations
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 12156522242..16f1a1ad846 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -6288,10 +6288,9 @@ impl<'a> Parser<'a> { // This mod is in an external file. Let's go get it! let ModulePathSuccess { path, directory_ownership, warn } = self.submod_path(id, &outer_attrs, id_span)?; - let (mut module, mut attrs) = + let (module, mut attrs) = self.eval_src_mod(path, directory_ownership, id.to_string(), id_span)?; // Record that we fetched the mod from an external file - module.inline = false; if warn { let attr = Attribute { id: attr::mk_attr_id(), @@ -6530,7 +6529,8 @@ impl<'a> Parser<'a> { p0.cfg_mods = self.cfg_mods; let mod_inner_lo = p0.span; let mod_attrs = p0.parse_inner_attributes()?; - let m0 = p0.parse_mod_items(&token::Eof, mod_inner_lo)?; + let mut m0 = p0.parse_mod_items(&token::Eof, mod_inner_lo)?; + m0.inline = false; self.sess.included_mod_stack.borrow_mut().pop(); Ok((m0, mod_attrs)) } |
