From a95c71e0ac3dc97468d7432d5011fbb413ba9263 Mon Sep 17 00:00:00 2001 From: Murarth Date: Sun, 23 Nov 2014 22:22:07 -0700 Subject: Fixed "::::" appearing in module_path!() --- src/libsyntax/ext/expand.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 04132679a03..a697d332d16 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -412,12 +412,19 @@ pub fn expand_item(it: P, 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 }, _ => { -- cgit 1.4.1-3-g733a5