user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extract error_on_circular_module

Browse source
This commit is contained in:
Mazdak Farrokhzad 2020-03-08 13:29:37 +01:00
parent 463995fe29
commit 59bf8a07f9
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/librustc_parse/parser/module.rs
View file

@ -118,15 +118,7 @@ fn eval_src_mod<'a>(
id: ast::Ident,
) -> PResult<'a, (Mod, Vec<Attribute>)> {
let mut included_mod_stack = sess.included_mod_stack.borrow_mut();
if let Some(i) = included_mod_stack.iter().position(|p| *p == path) {
let mut err = String::from("circular modules: ");
for p in &included_mod_stack[i..] {
err.push_str(&p.to_string_lossy());
err.push_str(" -> ");
}
err.push_str(&path.to_string_lossy());
return Err(sess.span_diagnostic.struct_span_err(id.span, &err[..]));
}
error_on_circular_module(sess, id.span, &path, &included_mod_stack)?;
included_mod_stack.push(path.clone());
drop(included_mod_stack);
@ -140,6 +132,24 @@ fn eval_src_mod<'a>(
Ok(module)
}
fn error_on_circular_module<'a>(
sess: &'a ParseSess,
span: Span,
path: &Path,
included_mod_stack: &[PathBuf],
) -> PResult<'a, ()> {
if let Some(i) = included_mod_stack.iter().position(|p| *p == path) {
let mut err = String::from("circular modules: ");
for p in &included_mod_stack[i..] {
err.push_str(&p.to_string_lossy());
err.push_str(" -> ");
}
err.push_str(&path.to_string_lossy());
return Err(sess.span_diagnostic.struct_span_err(span, &err[..]));
}
Ok(())
}
pub fn push_directory(
id: Ident,
attrs: &[Attribute],