From f1878d19faf9472f8860a3ff4fe605fdf93cef2c Mon Sep 17 00:00:00 2001 From: marmeladema Date: Mon, 31 Aug 2020 18:11:44 +0100 Subject: Move from {{closure}}#0 syntax to {closure#0} for (def) path components --- compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'compiler/rustc_codegen_llvm/src') diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs b/compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs index d1a55335c44..835d0d2e12d 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs @@ -7,7 +7,8 @@ use crate::common::CodegenCx; use crate::llvm; use crate::llvm::debuginfo::DIScope; use rustc_hir::def_id::DefId; -use rustc_hir::definitions::DefPathData; +use rustc_hir::definitions::{DefPathData, DefPathDataName}; +use rustc_span::symbol::Symbol; pub fn mangled_name_of_instance<'a, 'tcx>( cx: &CodegenCx<'a, 'tcx>, @@ -29,7 +30,12 @@ pub fn item_namespace(cx: &CodegenCx<'ll, '_>, def_id: DefId) -> &'ll DIScope { let namespace_name = match def_key.disambiguated_data.data { DefPathData::CrateRoot => cx.tcx.crate_name(def_id.krate), - data => data.as_symbol(), + data => match data.get_name() { + DefPathDataName::Named(name) => name, + DefPathDataName::Anon { namespace } => { + Symbol::intern(&format!("{{{{{}}}}}", namespace)) + } + }, }; let namespace_name = namespace_name.as_str(); -- cgit 1.4.1-3-g733a5