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

extract error_decl_mod_in_block

Browse Source
This commit is contained in:
Mazdak Farrokhzad 2020-03-07 19:15:35 +01:00
parent 2899a58cab
commit 185c1d340c
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,23 +129,22 @@ impl<'a> Parser<'a> {
DirectoryOwnership::Owned { .. } => {
paths.result.map_err(|err| self.span_fatal_err(id_sp, err))
}
DirectoryOwnership::UnownedViaBlock => {
let msg = "Cannot declare a non-inline module inside a block \
unless it has a path attribute";
let mut err = self.struct_span_err(id_sp, msg);
if paths.path_exists {
let msg = format!(
"Maybe `use` the module `{}` instead of redeclaring it",
paths.name
);
err.span_note(id_sp, &msg);
}
Err(err)
}
DirectoryOwnership::UnownedViaBlock => self.error_decl_mod_in_block(id_sp, paths),
DirectoryOwnership::UnownedViaMod => self.error_cannot_declare_mod_here(id_sp, paths),
}
}
fn error_decl_mod_in_block<T>(&self, id_sp: Span, paths: ModulePath) -> PResult<'a, T> {
let msg =
"Cannot declare a non-inline module inside a block unless it has a path attribute";
let mut err = self.struct_span_err(id_sp, msg);
if paths.path_exists {
let msg = format!("Maybe `use` the module `{}` instead of redeclaring it", paths.name);
err.span_note(id_sp, &msg);
}
Err(err)
}
fn error_cannot_declare_mod_here<T>(&self, id_sp: Span, paths: ModulePath) -> PResult<'a, T> {
let mut err = self.struct_span_err(id_sp, "cannot declare a new module at this location");
if !id_sp.is_dummy() {