OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

extract parse_external_module

Browse Source
This commit is contained in:
Mazdak Farrokhzad 2020-03-08 12:33:15 +01:00
parent 8bab88f2d9
commit 463995fe29
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/librustc_parse/parser/module.rs
View File

@ -44,12 +44,8 @@ impl<'a> Parser<'a> {
let id = self.parse_ident()?;
let (module, mut inner_attrs) = if self.eat(&token::Semi) {
if in_cfg && self.recurse_into_file_modules {
// This mod is in an external file. Let's go get it!
let dir = &self.directory;
submod_path(self.sess, id, &attrs, dir.ownership, &dir.path)
.and_then(|r| eval_src_mod(self.sess, self.cfg_mods, r.path, r.ownership, id))
.map_err(|mut err| err.emit())
.unwrap_or_default()
parse_external_module(self.sess, self.cfg_mods, id, dir.ownership, &dir.path, attrs)
} else {
Default::default()
}
@ -99,6 +95,20 @@ impl<'a> Parser<'a> {
}
}
fn parse_external_module(
sess: &ParseSess,
cfg_mods: bool,
id: ast::Ident,
ownership: DirectoryOwnership,
dir_path: &Path,
attrs: &[Attribute],
) -> (Mod, Vec<Attribute>) {
submod_path(sess, id, &attrs, ownership, dir_path)
.and_then(|r| eval_src_mod(sess, cfg_mods, r.path, r.ownership, id))
.map_err(|mut err| err.emit())
.unwrap_or_default()
}
/// Reads a module from a source file.
fn eval_src_mod<'a>(
sess: &'a ParseSess,