diff options
| author | Jakub Bukaj <jakub@jakub.cc> | 2014-11-16 10:21:18 +0100 |
|---|---|---|
| committer | Jakub Bukaj <jakub@jakub.cc> | 2014-11-16 10:21:18 +0100 |
| commit | f3fd09a6f57bb9b634a38e672bcd51ef0922dbe1 (patch) | |
| tree | 2f0610198043de81626cbdbddf703fb3c2385fca | |
| parent | c01c6e2cac7e75406f711c9c0344ab522421ce58 (diff) | |
| parent | 5416901ccad4550b6f7a6145de5dbbe94b98e309 (diff) | |
| download | rust-f3fd09a6f57bb9b634a38e672bcd51ef0922dbe1.tar.gz rust-f3fd09a6f57bb9b634a38e672bcd51ef0922dbe1.zip | |
rollup merge of #18965: cmr/master
| -rw-r--r-- | src/librustc/middle/trans/type_of.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/librustc/middle/trans/type_of.rs b/src/librustc/middle/trans/type_of.rs index a597325015c..9530c86a94c 100644 --- a/src/librustc/middle/trans/type_of.rs +++ b/src/librustc/middle/trans/type_of.rs @@ -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 { |