nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-18 09:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed "::::" appearing in module_path!()

Browse Source
This commit is contained in:
Murarth 2014-11-23 22:22:07 -07:00
parent c637cab853
commit a95c71e0ac
1 changed files with 9 additions and 2 deletions
Show Stats 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 { let mut new_items = match it.node {
ast::ItemMac(..) => expand_item_mac(it, fld), ast::ItemMac(..) => expand_item_mac(it, fld),
ast::ItemMod(_) | ast::ItemForeignMod(_) => { 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 macro_escape = contains_macro_escape(new_attrs.as_slice());
let result = with_exts_frame!(fld.cx.syntax_env, let result = with_exts_frame!(fld.cx.syntax_env,
macro_escape, macro_escape,
noop_fold_item(it, fld)); noop_fold_item(it, fld));
fld.cx.mod_pop(); if valid_ident {
fld.cx.mod_pop();
}
result result
}, },
_ => { _ => {