about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-11-24 16:07:00 +0000
committerbors <bors@rust-lang.org>2014-11-24 16:07:00 +0000
commit54c628cb849ad53b66f0d738dc8c83529a9d08d2 (patch)
tree64a7a9406350e7173617f8acefb3066f9bf0c376
parent377d7524a897ae91dfd48e7e34847af88dac49cb (diff)
parentbbe1a9b9c18d6dce6140ef16cbc9c29ad586564d (diff)
downloadrust-54c628cb849ad53b66f0d738dc8c83529a9d08d2.tar.gz
rust-54c628cb849ad53b66f0d738dc8c83529a9d08d2.zip
auto merge of #19258 : nick29581/rust/dxr-minor, r=brson
r?
-rw-r--r--src/librustc_trans/save/recorder.rs2
-rw-r--r--src/librustc_trans/save/span_utils.rs1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/librustc_trans/save/recorder.rs b/src/librustc_trans/save/recorder.rs
index 8eda199af3b..e245878dd87 100644
--- a/src/librustc_trans/save/recorder.rs
+++ b/src/librustc_trans/save/recorder.rs
@@ -171,7 +171,7 @@ impl<'a> FmtStrs<'a> {
 
         let pairs = fields.iter().zip(values);
         let mut strs = pairs.map(|(f, v)| format!(",{},\"{}\"", f, escape(
-            if *f == "qualname" {
+            if *f == "qualname" && v.len() > 0 {
                 let mut n = self.krate.clone();
                 n.push_str("::");
                 n.push_str(v);
diff --git a/src/librustc_trans/save/span_utils.rs b/src/librustc_trans/save/span_utils.rs
index e01081d8422..f76f2bea566 100644
--- a/src/librustc_trans/save/span_utils.rs
+++ b/src/librustc_trans/save/span_utils.rs
@@ -293,7 +293,6 @@ impl<'a> SpanUtils<'a> {
                 if ts.tok == token::Eof {
                     return None
                 } else {
-                    println!("found keyword: {} at {}", ts, ts.sp);
                     return self.make_sub_span(span, Some(ts.sp));
                 }
             }