From a4dd3fe2f2266c10ed0e3bc07a165c2f094e1c1b Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Tue, 21 Jan 2014 10:08:10 -0800 Subject: librustc: Fix merge fallout. --- src/libsyntax/ext/source_util.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/libsyntax/ext/source_util.rs') diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index a248cd84f71..44f3bb379f6 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -71,7 +71,12 @@ pub fn expand_stringify(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) pub fn expand_mod(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> base::MacResult { base::check_zero_tts(cx, sp, tts, "module_path!"); - let string = cx.mod_path().map(|x| cx.str_of(*x)).connect("::"); + let string = cx.mod_path() + .map(|x| { + let interned_str = token::get_ident(x.name); + interned_str.get().to_str() + }) + .connect("::"); base::MRExpr(cx.expr_str(sp, token::intern_and_get_ident(string))) } -- cgit 1.4.1-3-g733a5