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

auto merge of #19262 : murarth/rust/module-path-fix, r=jakub-

Browse source 
Closes #18859
This commit is contained in:
bors 2014-11-26 15:07:23 +00:00
commit 930f87774d
2 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libsyntax/ext/expand.rs
View file

@ -412,12 +412,19 @@ pub fn expand_item(it: P<ast::Item>, fld: &mut MacroExpander)
let mut new_items = match it.node {
ast::ItemMac(..) => expand_item_mac(it, fld),
ast::ItemMod(_) | ast::ItemForeignMod(_) => {
fld.cx.mod_push(it.ident);
let valid_ident =
it.ident.name != parse::token::special_idents::invalid.name;
if valid_ident {
fld.cx.mod_push(it.ident);
}
let macro_escape = contains_macro_escape(new_attrs.as_slice());
let result = with_exts_frame!(fld.cx.syntax_env,
macro_escape,
noop_fold_item(it, fld));
fld.cx.mod_pop();
if valid_ident {
fld.cx.mod_pop();
}
result
},
_ => {