rollup merge of #18965: cmr/master

This commit is contained in:
Jakub Bukaj 2014-11-16 10:21:18 +01:00
commit f3fd09a6f5

View File

@ -455,7 +455,12 @@ pub fn llvm_type_name(cx: &CrateContext,
let base = ty::item_path_str(cx.tcx(), did);
let strings: Vec<String> = tps.iter().map(|t| t.repr(cx.tcx())).collect();
let tstr = format!("{}<{}>", base, strings);
let tstr = if strings.is_empty() {
base
} else {
format!("{}<{}>", base, strings)
};
if did.krate == 0 {
format!("{}.{}", name, tstr)
} else {